diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 7596927..f07cc1c 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,11 +2,11 @@ - + - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 542659b..82156b4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vscode/settings.json b/.vscode/settings.json index 4fdc74b..5dd7145 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.rife2/dist/rife2-1.6.1.jar", + "${HOME}bld-1.7.0-SNAPSHOT.jar", "lib/compile/*.jar", "lib/runtime/*.jar", "lib/test/*.jar" diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 53c8953..99d7e64 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index f77b89b..8d5f3ca 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,5 +2,5 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.extensions= bld.repositories=MAVEN_CENTRAL,RIFE2 -rife2.downloadLocation= -rife2.version=1.6.1 +bld.downloadLocation= +bld.version=1.7.0 diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 2c39942..6a09479 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -19,23 +19,25 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(0, 9, 1); + version = version(0, 9, 2, "SNAPSHOT"); javaRelease = 17; downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - var pmd = version(7, 0, 0, "rc1"); + var pmd = version(7, 0, 0, "rc2"); + var rife2 = version(1,7,0); scope(compile) - .include(dependency("com.uwyn.rife2", "rife2", version(1, 6, 1))) + .include(dependency("com.uwyn.rife2", "rife2", rife2)) + .include(dependency("com.uwyn.rife2", "bld", rife2)) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) .include(dependency("org.slf4j", "slf4j-simple", version(2,0,7))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 2))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 9, 3))) .include(dependency("org.assertj:assertj-joda-time:2.2.0")); javadocOperation() diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 1e0a4c6..4c5b3dc 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -46,7 +46,22 @@ public class PmdOperation extends AbstractOperation { public static final String RULE_SET_DEFAULT = "rulesets/java/quickstart.xml"; private static final Logger LOGGER = Logger.getLogger(PmdOperation.class.getName()); private static final String PMD_DIR = "pmd"; - + /** + * The input paths (source) list. + */ + final List inputPaths = new ArrayList<>(); + /** + * The relative roots paths. + */ + final List relativizeRoots = new ArrayList<>(); + /** + * The rule priority. + */ + final RulePriority rulePriority = RulePriority.LOW; + /** + * The rule sets list. + */ + final List ruleSets = new ArrayList<>(); /** * The cache location. */ @@ -75,10 +90,6 @@ public class PmdOperation extends AbstractOperation { * The incremental analysis toggle. */ boolean incrementalAnalysis = true; - /** - * The input paths (source) list. - */ - List inputPaths = new ArrayList<>(); /** * The input URI. */ @@ -87,10 +98,6 @@ public class PmdOperation extends AbstractOperation { * The default language version(s). */ List languageVersions; - /** - * The relative roots paths. - */ - List relativizeRoots = new ArrayList<>(); /** * The path to the report page. */ @@ -99,14 +106,6 @@ public class PmdOperation extends AbstractOperation { * The report format. */ String reportFormat = "text"; - /** - * The rule priority. - */ - RulePriority rulePriority = RulePriority.LOW; - /** - * The rule sets list. - */ - List ruleSets = new ArrayList<>(); /** * The show suppressed flag. */