Skip to content

Commit 4f4f8b1

Browse files
committed
update dependencies
1 parent 2ec34de commit 4f4f8b1

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

code-assert-maven-plugin/src/main/java/guru/nidi/codeassert/AssertMojo.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import org.apache.maven.execution.MavenSession;
1919
import org.apache.maven.plugin.*;
20-
import org.apache.maven.plugins.annotations.*;
2120
import org.apache.maven.plugins.annotations.Mojo;
21+
import org.apache.maven.plugins.annotations.*;
2222
import org.apache.maven.project.MavenProject;
2323
import org.codehaus.plexus.util.FileUtils;
2424

@@ -33,7 +33,8 @@
3333
*/
3434
@Mojo(name = "assert", defaultPhase = LifecyclePhase.TEST, requiresDependencyResolution = ResolutionScope.TEST)
3535
public class AssertMojo extends AbstractMojo {
36-
static final String JACOCO_VERSION = "0.7.9";
36+
static final String JACOCO_VERSION = "0.8.5";
37+
private static final String SUREFIRE_VERSION = "2.22.2";
3738

3839
/**
3940
* The test class to be run.
@@ -75,7 +76,7 @@ private void runTest() throws MojoExecutionException {
7576
plugin(
7677
groupId("org.apache.maven.plugins"),
7778
artifactId("maven-surefire-plugin"),
78-
version("2.19.1")
79+
version(SUREFIRE_VERSION)
7980
),
8081
goal("test"),
8182
configuration(

code-assert/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>guru.nidi</groupId>
8989
<artifactId>graphviz-java</artifactId>
90-
<version>0.8.4</version>
90+
<version>0.12.0</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>org.hamcrest</groupId>

code-assert/src/main/java/guru/nidi/codeassert/io/ModelVisualizer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717

1818
import guru.nidi.codeassert.model.CodePackage;
1919
import guru.nidi.codeassert.model.Model;
20-
import guru.nidi.graphviz.attribute.RankDir;
20+
import guru.nidi.graphviz.attribute.Rank;
2121
import guru.nidi.graphviz.engine.Graphviz;
2222
import guru.nidi.graphviz.model.*;
2323

2424
import java.util.function.Function;
2525

26+
import static guru.nidi.graphviz.attribute.Rank.RankDir.LEFT_TO_RIGHT;
2627
import static guru.nidi.graphviz.model.Factory.mutGraph;
2728

2829
public class ModelVisualizer {
@@ -35,7 +36,7 @@ public ModelVisualizer(Model model) {
3536
public Visualized visualizePackages(Function<CodePackage, MutableNode> transform) {
3637
final MutableGraph graph = CreationContext.use(ctx -> {
3738
final MutableGraph g = mutGraph().setDirected(true)
38-
.graphAttrs().add(RankDir.LEFT_TO_RIGHT);
39+
.graphAttrs().add(Rank.dir(LEFT_TO_RIGHT));
3940
for (CodePackage pack : model.getPackages()) {
4041
g.add(transform.apply(pack));
4142
}

code-assert/src/main/java/guru/nidi/codeassert/pmd/PmdUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private static String className(String packageName, String rawFilename) {
4444
} else {
4545
//TODO can this heuristic be improved?
4646
final int src = filename.indexOf("src/") + 3;
47-
final int java = filename.indexOf("java/") + 4;
47+
final int java = filename.indexOf("java/") + 4; //TODO problem with "/graphviz-java/src/main/java/..." matches first "java/"
4848
final int later = Math.max(src, java);
4949
if (later >= 4) {
5050
prefix = filename.substring(later + 1, last + 1).replace('/', '.');

0 commit comments

Comments
 (0)