update parent pom

Signed-off-by: Stefan Niederhauser <[email protected]>

Author: nidi3

graphviz-java/src/test/java/guru/nidi/graphviz/CodeAnalysisTest.java

@@ -22,7 +22,6 @@
 import guru.nidi.codeassert.dependency.*;
 import guru.nidi.codeassert.findbugs.*;
 import guru.nidi.codeassert.junit.CodeAssertJunit5Test;
-import guru.nidi.codeassert.junit.PredefConfig;
 import guru.nidi.codeassert.pmd.*;
 import guru.nidi.graphviz.attribute.*;
 import guru.nidi.graphviz.engine.*;
@@ -64,7 +63,7 @@ public void defineRules() {
     @Override
     protected FindBugsResult analyzeFindBugs() {
         final BugCollector collector = new BugCollector().minPriority(Priorities.NORMAL_PRIORITY)
-                .apply(PredefConfig.dependencyTestIgnore(CodeAnalysisTest.class))
+                .apply(FindBugsConfigs.dependencyTestIgnore(CodeAnalysisTest.class))
                 .because("It's examples", In.loc("ReadmeTest").ignore("DLS_DEAD_LOCAL_STORE"))
                 .because("GraphvizServer is on localhost",
                         In.locs("GraphvizServer", "GraphvizServerEngine")
@@ -85,7 +84,7 @@ protected FindBugsResult analyzeFindBugs() {
     @Override
     protected PmdResult analyzePmd() {
         final PmdViolationCollector collector = new PmdViolationCollector().minPriority(RulePriority.MEDIUM)
-                .apply(PredefConfig.minimalPmdIgnore())
+                .apply(PmdConfigs.minimalPmdIgnore())
                 .because("It's examples", In.locs("ExampleTest", "ReadmeTest")
                         .ignore("JUnitTestsShouldIncludeAssert", "LocalVariableCouldBeFinal", "UnusedLocalVariable"))
                 .because("It's a test", In.loc("*Test")
@@ -120,14 +119,14 @@ protected PmdResult analyzePmd() {
                 .because("It's wrapping an Exception with a RuntimeException",
                         In.classes(Graphviz.class, CreationContext.class).ignore("AvoidCatchingGenericException"));
         return new PmdAnalyzer(AnalyzerConfig.maven().mainAndTest(), collector)
-                .withRulesets(PredefConfig.defaultPmdRulesets())
+                .withRulesets(PmdConfigs.defaultPmdRulesets())
                 .analyze();
     }
 
     @Override
     protected CpdResult analyzeCpd() {
         final CpdMatchCollector collector = new CpdMatchCollector()
-                .apply(PredefConfig.cpdIgnoreEqualsHashCodeToString())
+                .apply(PmdConfigs.cpdIgnoreEqualsHashCodeToString())
                 .because("It's java",
                         In.loc("*Graph").ignore("Graph(strict, directed, cluster, name,", "if (strict != graph.strict) {"))
                 .just(In.locs("GraphvizGraalEngine","GraphvizNashornEngine").ignore("void doInit()"));
@@ -137,10 +136,10 @@ protected CpdResult analyzeCpd() {
     @Override
     protected CheckstyleResult analyzeCheckstyle() {
         final StyleEventCollector collector = new StyleEventCollector()
-                .apply(PredefConfig.minimalCheckstyleIgnore())
+                .apply(CheckstyleConfigs.minimalCheckstyleIgnore())
                 .just(In.locs("Color", "Arrow", "Rank", "RankDir", "Shape", "Token", "Style", "Options", "Records", "SystemUtils", "GraphAttr").ignore("empty.line.separator"))
                 .just(In.clazz(For.class).ignore("one.top.level.class"));
-        final StyleChecks checks = PredefConfig.adjustedGoogleStyleChecks();
+        final StyleChecks checks = CheckstyleConfigs.adjustedGoogleStyleChecks();
         return new CheckstyleAnalyzer(AnalyzerConfig.maven().main(), checks, collector).analyze();
     }
 }

graphviz-kotlin/src/test/kotlin/guru/nidi/graphviz/CodeAnalysisTest.kt

@@ -15,14 +15,12 @@
  */
 package guru.nidi.graphviz
 
-import guru.nidi.codeassert.checkstyle.CheckstyleAnalyzer
-import guru.nidi.codeassert.checkstyle.StyleEventCollector
+import guru.nidi.codeassert.checkstyle.*
 import guru.nidi.codeassert.config.AnalyzerConfig
 import guru.nidi.codeassert.config.In
 import guru.nidi.codeassert.config.Language.KOTLIN
 import guru.nidi.codeassert.dependency.*
 import guru.nidi.codeassert.junit.CodeAssertJunit5Test
-import guru.nidi.codeassert.junit.PredefConfig
 import guru.nidi.codeassert.junit.kotlin.KotlinCodeAssertMatchers.hasNoKtlintIssues
 import guru.nidi.codeassert.ktlint.KtlintAnalyzer
 import guru.nidi.codeassert.ktlint.KtlintCollector
@@ -45,15 +43,15 @@ class CodeAnalysisTest : CodeAssertJunit5Test() {
                 .analyze()
     }
 
-    override fun analyzeCheckstyle() = CheckstyleAnalyzer(config, PredefConfig.adjustedGoogleStyleChecks(), StyleEventCollector()
-            .apply(PredefConfig.minimalCheckstyleIgnore()))
+    override fun analyzeCheckstyle() = CheckstyleAnalyzer(config, CheckstyleConfigs.adjustedGoogleStyleChecks(), StyleEventCollector()
+            .apply(CheckstyleConfigs.minimalCheckstyleIgnore()))
             .analyze()!!
 
     override fun analyzeCpd() = CpdAnalyzer(config, 25, CpdMatchCollector()).analyze()!!
 
     override fun analyzePmd() = PmdAnalyzer(config, PmdViolationCollector()
-            .apply(PredefConfig.minimalPmdIgnore()))
-            .withRulesets(*PredefConfig.defaultPmdRulesets())
+            .apply(PmdConfigs.minimalPmdIgnore()))
+            .withRulesets(*PmdConfigs.defaultPmdRulesets())
             .analyze()!!
 
     //TODO findbugs crashed the JVM! WTF!?

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>guru.nidi</groupId>
         <artifactId>guru-nidi-parent-pom</artifactId>
-        <version>1.1.21</version>
+        <version>1.1.24</version>
         <relativePath />
     </parent>