From af395dd69b52c21cda09a598cd97d6ec5836dbf7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 22 Jun 2024 15:14:49 -0700 Subject: [PATCH 01/52] Minor documentation cleanups --- .../java/rife/bld/extension/PmdOperation.java | 117 +++++++++--------- 1 file changed, 60 insertions(+), 57 deletions(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 7bd5997..6c1e8c1 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -129,6 +129,54 @@ public class PmdOperation extends AbstractOperation { */ private int threads_ = 1; + /** + * Adds paths to source files, or directories containing source files to analyze.\ + * + * @param inputPath one or more paths + * @return this operation + * @see #inputPaths(Path...) + */ + public PmdOperation addInputPaths(Path... inputPath) { + inputPaths_.addAll(List.of(inputPath)); + return this; + } + + /** + * Adds paths to source files, or directories containing source files to analyze. + * + * @param inputPath one or more paths + * @return this operation + * @see #inputPaths(File...) + */ + public PmdOperation addInputPaths(File... inputPath) { + inputPaths_.addAll(Arrays.stream(inputPath).map(File::toPath).toList()); + return this; + } + + /** + * Adds paths to source files, or directories containing source files to analyze. + * + * @param inputPath one or more paths + * @return this operation + * @see #addInputPaths(String...) + */ + public PmdOperation addInputPaths(String... inputPath) { + inputPaths_.addAll(Arrays.stream(inputPath).map(Paths::get).toList()); + return this; + } + + /** + * Adds paths to source files, or directories containing source files to analyze. + * + * @param inputPath a collection of input paths + * @return this operation + * @see #inputPaths(Collection) + */ + public PmdOperation addInputPaths(Collection inputPath) { + inputPaths_.addAll(inputPath); + return this; + } + /** * Adds new rule set paths. *

@@ -170,7 +218,7 @@ public class PmdOperation extends AbstractOperation { *

  • {@code category/java/security.xml}
    • * * - * @param ruleSet one or more rule set + * @param ruleSet a collection of rule set paths * @return this operation * @see #ruleSets(Collection */ @@ -201,7 +249,7 @@ public class PmdOperation extends AbstractOperation { /** * Sets the default language version to be used for all input files. * - * @param languageVersion the language versions + * @param languageVersion a collection language versions * @return this operation */ public PmdOperation defaultLanguageVersions(Collection languageVersion) { @@ -414,7 +462,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath one or more paths * @return this operation - * @see #addInputPaths(Path...) + * @see #addInputPaths(Path...) */ public PmdOperation inputPaths(Path... inputPath) { inputPaths_.clear(); @@ -429,7 +477,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath one or more paths * @return this operation - * @see #addInputPaths(File...) + * @see #addInputPaths(File...) */ public PmdOperation inputPaths(File... inputPath) { inputPaths_.clear(); @@ -441,9 +489,10 @@ public class PmdOperation extends AbstractOperation { * Sets paths to source files, or directories containing source files to analyze. *

    * Previous entries are disregarded. + * * @param inputPath one or more paths * @return this operation - * @see #addInputPaths(String...) + * @see #addInputPaths(String...) */ public PmdOperation inputPaths(String... inputPath) { inputPaths_.clear(); @@ -455,62 +504,16 @@ public class PmdOperation extends AbstractOperation { * Sets paths to source files, or directories containing source files to analyze. *

    * Previous entries are disregarded. - * @param inputPath the input paths + * + * @param inputPath a collection of input paths * @return this operation - * @see #addInputPaths(Collection) + * @see #addInputPaths(Collection) */ public PmdOperation inputPaths(Collection inputPath) { inputPaths_.clear(); inputPaths_.addAll(inputPath); return this; } - /** - * Adds paths to source files, or directories containing source files to analyze.\ - * - * @param inputPath one or more paths - * @return this operation - * @see #inputPaths(Path...) - */ - public PmdOperation addInputPaths(Path... inputPath) { - inputPaths_.addAll(List.of(inputPath)); - return this; - } - - /** - * Adds paths to source files, or directories containing source files to analyze. - * - * @param inputPath one or more paths - * @return this operation - * @see #inputPaths(File...) - */ - public PmdOperation addInputPaths(File... inputPath) { - inputPaths_.addAll(Arrays.stream(inputPath).map(File::toPath).toList()); - return this; - } - - /** - * Adds paths to source files, or directories containing source files to analyze. - * - * @param inputPath one or more paths - * @return this operation - * @see #addInputPaths(String...) - */ - public PmdOperation addInputPaths(String... inputPath) { - inputPaths_.addAll(Arrays.stream(inputPath).map(Paths::get).toList()); - return this; - } - - /** - * Adds paths to source files, or directories containing source files to analyze. - * - * @param inputPath the input paths - * @return this operation - * @see #inputPaths(Collection) - */ - public PmdOperation addInputPaths(Collection inputPath) { - inputPaths_.addAll(inputPath); - return this; - } /** * Returns paths to source files, or directories containing source files to analyze. @@ -535,7 +538,7 @@ public class PmdOperation extends AbstractOperation { /** * Sets the default language versions. * - * @param languageVersions the language versions + * @param languageVersions a collection language versions * @return this operation */ public PmdOperation languageVersions(Collection languageVersions) { @@ -661,7 +664,7 @@ public class PmdOperation extends AbstractOperation { /** * Adds several paths to shorten paths that are output in the report. * - * @param relativeRoot the relative root paths + * @param relativeRoot a collection of relative root paths * @return this operations */ public PmdOperation relativizeRoots(Collection relativeRoot) { @@ -784,7 +787,7 @@ public class PmdOperation extends AbstractOperation { *

  • {@code category/java/security.xml}
    • * * - * @param ruleSet one or more rule set + * @param ruleSet a collection of rule set paths * @return this operation * @see #addRuleSet(Collection) */ From 12552137eea273ab2a4bcd38c58f37b5f2a7a476 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Jun 2024 11:48:21 -0700 Subject: [PATCH 02/52] Set exit status on failure --- .../java/rife/bld/extension/PmdOperation.java | 25 ++++---- .../rife/bld/extension/PmdOperationTest.java | 60 ++++++++++--------- 2 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 6c1e8c1..f374349 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -22,6 +22,7 @@ import net.sourceforge.pmd.lang.LanguageVersion; import net.sourceforge.pmd.lang.rule.RulePriority; import rife.bld.BaseProject; import rife.bld.operations.AbstractOperation; +import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; import java.net.URI; @@ -282,9 +283,12 @@ public class PmdOperation extends AbstractOperation { * Performs the PMD code analysis operation. */ @Override - public void execute() { + public void execute() throws Exception { if (project_ == null) { - throw new IllegalArgumentException("ERROR: project required."); + if (LOGGER.isLoggable(Level.SEVERE) && !silent()) { + LOGGER.log(Level.SEVERE, "A project is required to run this operation."); + } + throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); } var commandName = project_.getCurrentCommandName(); @@ -574,17 +578,17 @@ public class PmdOperation extends AbstractOperation { * @throws RuntimeException if an error occurs */ @SuppressWarnings({"PMD.CloseResource", "PMD.AvoidInstantiatingObjectsInLoops"}) - public int performPmdAnalysis(String commandName, PMDConfiguration config) throws RuntimeException { + public int performPmdAnalysis(String commandName, PMDConfiguration config) throws ExitStatusException { var pmd = PmdAnalysis.create(config); var report = pmd.performAnalysisAndCollectReport(); - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isLoggable(Level.INFO) && !silent()) { LOGGER.log(Level.INFO, "[{0}] inputPaths{1}", new Object[]{commandName, inputPaths_}); LOGGER.log(Level.INFO, "[{0}] ruleSets{1}", new Object[]{commandName, ruleSets_}); } var numErrors = report.getViolations().size(); if (numErrors > 0) { for (var v : report.getViolations()) { - if (LOGGER.isLoggable(Level.WARNING)) { + if (LOGGER.isLoggable(Level.WARNING) && !silent()) { final String msg; if (includeLineNumber_) { msg = "[{0}] {1}:{2}\n\t{3} ({4})\n\t\t--> {5}"; @@ -607,11 +611,12 @@ public class PmdOperation extends AbstractOperation { "[%s] %d rule violations were found. See the report at: %s", commandName, numErrors, config.getReportFilePath().toUri()); if (config.isFailOnViolation()) { - throw new RuntimeException(violations); // NOPMD - } else { - if (LOGGER.isLoggable(Level.WARNING)) { - LOGGER.warning(violations); + if (LOGGER.isLoggable(Level.SEVERE) && !silent()) { + LOGGER.log(Level.SEVERE, violations); } + throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); + } else if (LOGGER.isLoggable(Level.WARNING) && !silent()) { + LOGGER.warning(violations); } } else { var rules = pmd.getRulesets(); @@ -620,7 +625,7 @@ public class PmdOperation extends AbstractOperation { for (var rule : rules) { count += rule.getRules().size(); } - if (LOGGER.isLoggable(Level.INFO)) { + if (LOGGER.isLoggable(Level.INFO) && !silent()) { LOGGER.info(String.format("[%s] %d rules were checked.", commandName, count)); } } diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index 6cb5dce..ad387ac 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -21,6 +21,7 @@ import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.rule.RulePriority; import org.junit.jupiter.api.Test; import rife.bld.BaseProject; +import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; import java.io.FileNotFoundException; @@ -66,7 +67,7 @@ class PmdOperationTest { } @Test - void testAddInputPath() { + void testAddInputPath() throws ExitStatusException { var project = new BaseProject(); var pmd = new PmdOperation().fromProject(project); @@ -93,13 +94,12 @@ class PmdOperationTest { project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); - assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .isGreaterThan(0).isEqualTo(err); } @Test - void testAddRuleSets() { + void testAddRuleSets() throws ExitStatusException { var pmd = new PmdOperation().fromProject(new BaseProject()); assertThat(pmd.ruleSets()).containsExactly(PmdOperation.RULE_SET_DEFAULT); @@ -122,7 +122,7 @@ class PmdOperationTest { } @Test - void testCache() { + void testCache() throws ExitStatusException { var cache = Path.of("build/pmd/temp-cache"); var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML).inputPaths(List.of(CODE_STYLE_SAMPLE)).cache(cache); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); @@ -143,7 +143,13 @@ class PmdOperationTest { } @Test - void testExecute() { + void testExecuteNoProject() { + var pmd = new PmdOperation(); + assertThatCode(pmd::execute).isInstanceOf(ExitStatusException.class); + } + + @Test + void testExecute() throws ExitStatusException { var pmd = new PmdOperation().fromProject(new BaseProject()); assertThat(pmd.inputPaths()).containsExactly(Paths.get("src/main").toAbsolutePath(), @@ -162,11 +168,11 @@ class PmdOperationTest { var pmd = newPmdOperation().ruleSets(DOCUMENTATION_XML) .inputPaths(Path.of("src/test/resources/java/Documentation.java")); assertThatCode(() -> pmd.failOnViolation(true).performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) - .isInstanceOf(RuntimeException.class).hasMessageContaining('[' + TEST + ']'); + .isInstanceOf(ExitStatusException.class); } @Test - void testIgnoreFile() { + void testIgnoreFile() throws ExitStatusException { var pmd = newPmdOperation() .ruleSets(ERROR_PRONE_XML, CODE_STYLE_XML) .ignoreFile(Path.of("src/test/resources/ignore.txt")); @@ -191,7 +197,7 @@ class PmdOperationTest { } @Test - void testInputPaths() { + void testInputPaths() throws ExitStatusException { var pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPaths(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); @@ -200,20 +206,20 @@ class PmdOperationTest { } @Test - void testJavaBestPractices() { + void testJavaBestPractices() throws ExitStatusException { var pmd = newPmdOperation().ruleSets("category/java/bestpractices.xml") .inputPaths(Path.of("src/test/resources/java/BestPractices.java")); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @Test - void testJavaCodeStyle() { + void testJavaCodeStyle() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML).inputPaths(CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @Test - void testJavaCodeStyleAndErrorProne() { + void testJavaCodeStyleAndErrorProne() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML).inputPaths(CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .as("code style").isGreaterThan(0); @@ -223,7 +229,7 @@ class PmdOperationTest { } @Test - void testJavaDesign() { + void testJavaDesign() throws ExitStatusException { var pmd = newPmdOperation() .ruleSets(DESIGN_XML) .inputPaths("src/test/resources/java/Design.java") @@ -232,7 +238,7 @@ class PmdOperationTest { } @Test - void testJavaDocumentation() { + void testJavaDocumentation() throws ExitStatusException { var pmd = newPmdOperation() .ruleSets(DOCUMENTATION_XML) .inputPaths(Path.of("src/test/resources/java/Documentation.java")); @@ -240,20 +246,20 @@ class PmdOperationTest { } @Test - void testJavaErrorProne() { + void testJavaErrorProne() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(ERROR_PRONE_XML).inputPaths(ERROR_PRONE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @Test - void testJavaMultiThreading() { + void testJavaMultiThreading() throws ExitStatusException { var pmd = newPmdOperation().ruleSets("category/java/multithreading.xml") .inputPaths(Path.of("src/test/resources/java/MultiThreading.java")); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @Test - void testJavaPerformance() { + void testJavaPerformance() throws ExitStatusException { var pmd = newPmdOperation() .ruleSets(PERFORMANCE_XML) .inputPaths(Path.of("src/test/resources/java/Performance.java")); @@ -261,7 +267,7 @@ class PmdOperationTest { } @Test - void testJavaQuickStart() { + void testJavaQuickStart() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(PmdOperation.RULE_SET_DEFAULT) .inputPaths(new File("src/test/resources/java/")); assertThat(pmd.ruleSets()).containsExactly(PmdOperation.RULE_SET_DEFAULT); @@ -269,14 +275,14 @@ class PmdOperationTest { } @Test - void testJavaSecurity() { + void testJavaSecurity() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(SECURITY_XML) .inputPaths(Path.of("src/test/resources/java/Security.java")); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @Test - void testLanguageVersions() { + void testLanguageVersions() throws ExitStatusException { var language = LanguageRegistry.PMD.getLanguageById("java"); assertThat(language).isNotNull(); @@ -295,14 +301,14 @@ class PmdOperationTest { } @Test - void testMainOperation() { + void testMainOperation() throws ExitStatusException { var pmd = newPmdOperation().inputPaths(new File("src/main")) .performPmdAnalysis(TEST, newPmdOperation().initConfiguration(COMMAND_NAME)); assertThat(pmd).isEqualTo(0); } @Test - void testPriority() { + void testPriority() throws ExitStatusException { var pmd = newPmdOperation().inputPaths(CODE_STYLE_SAMPLE).minimumPriority(RulePriority.HIGH); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(0); } @@ -321,7 +327,7 @@ class PmdOperationTest { } @Test - void testReportFile() throws FileNotFoundException { + void testReportFile() throws FileNotFoundException, ExitStatusException { var report = new File("build", "pmd-report-file"); report.deleteOnExit(); var pmd = newPmdOperation().ruleSets(List.of(ERROR_PRONE_XML, DESIGN_XML)).reportFile(report); @@ -338,7 +344,7 @@ class PmdOperationTest { } @Test - void testReportFormat() throws IOException { + void testReportFormat() throws IOException, ExitStatusException { var pmd = newPmdOperation().ruleSets(ERROR_PRONE_XML).reportFormat("xml").inputPaths(ERROR_PRONE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); try (var br = Files.newBufferedReader(pmd.reportFile())) { @@ -347,7 +353,7 @@ class PmdOperationTest { } @Test - void testReportProperties() { + void testReportProperties() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML, ERROR_PRONE_XML) .includeLineNumber(true) .reportProperties(new Properties()); @@ -355,14 +361,14 @@ class PmdOperationTest { } @Test - void testRuleSetsConfigFile() { + void testRuleSetsConfigFile() throws ExitStatusException { var pmd = newPmdOperation().ruleSets("src/test/resources/pmd.xml") .ignoreFile("src/test/resources/ignore-all.txt"); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(0); } @Test - void testRuleSetsEmpty() { + void testRuleSetsEmpty() throws ExitStatusException { var pmd = newPmdOperation().ruleSets(""); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(0); } @@ -397,7 +403,7 @@ class PmdOperationTest { } @Test - void testXml() { + void testXml() throws ExitStatusException { var pmd = newPmdOperation().addInputPaths("src/test/resources/pmd.xml") .ruleSets("src/test/resources/xml/basic.xml"); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); From f7216e6d11855751a3fe1dd7a1f9db32b3281837 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 27 Jun 2024 20:58:57 -0700 Subject: [PATCH 03/52] Bumped JUnit to version 5.10.3 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 92253f0..a7e0874 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -32,7 +32,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 0); + version = version(1, 1, 1, "SNAPSHOT"); javaRelease = 17; @@ -48,8 +48,8 @@ public class PmdOperationBuild extends Project { .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 13))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 0))); javadocOperation() From 03fd552702ad05279a9212f937ba60153630fd2e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 27 Jun 2024 21:26:03 -0700 Subject: [PATCH 04/52] Version 1.1.1 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index a7e0874..7ea5d9b 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -32,7 +32,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 1, "SNAPSHOT"); + version = version(1, 1, 1); javaRelease = 17; From efce6b9729753a1c7806c0b25562d2450f242911 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Jun 2024 17:47:54 -0700 Subject: [PATCH 05/52] Added failOnError (PMD 7.3.0) support --- .../rife/bld/extension/PmdOperationBuild.java | 4 +- .../java/rife/bld/extension/PmdOperation.java | 45 +++++++++++++++---- .../rife/bld/extension/PmdOperationTest.java | 26 ++++++++--- src/test/resources/pmd.xml | 4 +- src/test/resources/xml/basic.xml | 4 +- src/test/resources/xml/old.xml | 8 ++++ 6 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 src/test/resources/xml/old.xml diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 7ea5d9b..3f23dd1 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -32,7 +32,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 1); + version = version(1, 1, 2); javaRelease = 17; @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - var pmd = version(7, 2, 0); + var pmd = version(7, 3, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index f374349..8aaea0d 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -69,6 +69,10 @@ public class PmdOperation extends AbstractOperation { * The encoding. */ private Charset encoding_ = StandardCharsets.UTF_8; + /** + * The fail on error toggle. + */ + private boolean failOnError_ = true; /** * The fail on violation toggle. */ @@ -296,7 +300,28 @@ public class PmdOperation extends AbstractOperation { } /** - * Sets whether the build will continue on warnings. + * Sets whether the build will exit on recoverable errors. + *

    + * Default is: {@code true} + *

    + * Note: If only violations are found, see {@link #failOnViolation(boolean) failOnViolation} + * + * @param failOnError whether to exit and fail the build if recoverable errors occurred + * @return this operation + * @see #failOnViolation(boolean) + */ + public PmdOperation failOnError(boolean failOnError) { + failOnError_ = failOnError; + return this; + } + + /** + * Sets whether the build will continue on violations. + *

    + * Note: If additionally recoverable errors occurred, see {@link #failOnError(boolean) failOnError} + * + * @param failOnViolation whether to exit and fail the build if violations are found + * @return this operation */ public PmdOperation failOnViolation(boolean failOnViolation) { failOnViolation_ = failOnViolation; @@ -411,6 +436,7 @@ public class PmdOperation extends AbstractOperation { config.setAnalysisCacheLocation(cache_.toFile().getAbsolutePath()); } + config.setFailOnError(failOnError_); config.setFailOnViolation(failOnViolation_); if (languageVersions_ != null) { @@ -574,8 +600,8 @@ public class PmdOperation extends AbstractOperation { * * @param commandName the command name * @param config the configuration - * @return the number of errors - * @throws RuntimeException if an error occurs + * @return the number of violations + * @throws ExitStatusException if an error occurs */ @SuppressWarnings({"PMD.CloseResource", "PMD.AvoidInstantiatingObjectsInLoops"}) public int performPmdAnalysis(String commandName, PMDConfiguration config) throws ExitStatusException { @@ -585,8 +611,9 @@ public class PmdOperation extends AbstractOperation { LOGGER.log(Level.INFO, "[{0}] inputPaths{1}", new Object[]{commandName, inputPaths_}); LOGGER.log(Level.INFO, "[{0}] ruleSets{1}", new Object[]{commandName, ruleSets_}); } - var numErrors = report.getViolations().size(); - if (numErrors > 0) { + + var numViolations = report.getViolations().size(); + if (numViolations > 0) { for (var v : report.getViolations()) { if (LOGGER.isLoggable(Level.WARNING) && !silent()) { final String msg; @@ -608,7 +635,7 @@ public class PmdOperation extends AbstractOperation { } var violations = String.format( - "[%s] %d rule violations were found. See the report at: %s", commandName, numErrors, + "[%s] %d rule violations were found. See the report at: %s", commandName, numViolations, config.getReportFilePath().toUri()); if (config.isFailOnViolation()) { if (LOGGER.isLoggable(Level.SEVERE) && !silent()) { @@ -616,8 +643,10 @@ public class PmdOperation extends AbstractOperation { } throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); } else if (LOGGER.isLoggable(Level.WARNING) && !silent()) { - LOGGER.warning(violations); + LOGGER.warning(violations); } + } else if (pmd.getReporter().numErrors() > 0 && failOnError_) { + throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); } else { var rules = pmd.getRulesets(); if (!rules.isEmpty()) { @@ -630,7 +659,7 @@ public class PmdOperation extends AbstractOperation { } } } - return numErrors; + return numViolations; } /** diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index ad387ac..6d042a7 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -142,12 +142,6 @@ class PmdOperationTest { assertThat(config.getSourceEncoding()).as("ISO_8859").isEqualTo(StandardCharsets.ISO_8859_1); } - @Test - void testExecuteNoProject() { - var pmd = new PmdOperation(); - assertThatCode(pmd::execute).isInstanceOf(ExitStatusException.class); - } - @Test void testExecute() throws ExitStatusException { var pmd = new PmdOperation().fromProject(new BaseProject()); @@ -163,12 +157,30 @@ class PmdOperationTest { assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(0); } + @Test + void testExecuteNoProject() { + var pmd = new PmdOperation(); + assertThatCode(pmd::execute).isInstanceOf(ExitStatusException.class); + } + + @Test + void testFailOnError() { + var pmd = newPmdOperation().ruleSets("src/test/resources/xml/old.xml") + .inputPaths(Path.of("src/test/resources/java/Documentation.java")); + assertThatCode(() -> pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) + .isInstanceOf(ExitStatusException.class); + assertThatCode(() -> pmd.failOnError(false).performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) + .doesNotThrowAnyException(); + } + @Test void testFailOnValidation() { var pmd = newPmdOperation().ruleSets(DOCUMENTATION_XML) .inputPaths(Path.of("src/test/resources/java/Documentation.java")); assertThatCode(() -> pmd.failOnViolation(true).performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .isInstanceOf(ExitStatusException.class); + assertThatCode(() -> pmd.failOnViolation(false).performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) + .doesNotThrowAnyException(); } @Test @@ -369,7 +381,7 @@ class PmdOperationTest { @Test void testRuleSetsEmpty() throws ExitStatusException { - var pmd = newPmdOperation().ruleSets(""); + var pmd = newPmdOperation().ruleSets("").failOnError(false); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isEqualTo(0); } diff --git a/src/test/resources/pmd.xml b/src/test/resources/pmd.xml index c4c6617..18cc49b 100644 --- a/src/test/resources/pmd.xml +++ b/src/test/resources/pmd.xml @@ -1,7 +1,7 @@ - Erik's Ruleset diff --git a/src/test/resources/xml/basic.xml b/src/test/resources/xml/basic.xml index c261dc7..4043fba 100644 --- a/src/test/resources/xml/basic.xml +++ b/src/test/resources/xml/basic.xml @@ -1,8 +1,8 @@ - The Basic ruleset contains a collection of good practices which should be followed. diff --git a/src/test/resources/xml/old.xml b/src/test/resources/xml/old.xml new file mode 100644 index 0000000..fa71516 --- /dev/null +++ b/src/test/resources/xml/old.xml @@ -0,0 +1,8 @@ + + + Deprecated (old) rule + + \ No newline at end of file From a253342bd6cd5e59675d1913f86ff334d0bfe4a9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 22 Jul 2024 20:19:41 -0700 Subject: [PATCH 06/52] Bumped to bld version 2.0.0-SNAPSHOT --- .github/workflows/bld.yml | 7 ++----- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- lib/bld/bld-wrapper.jar | Bin 27319 -> 29519 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 11 +++++------ 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index c0ba763..bf65051 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -22,11 +22,8 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Grant execute permission for bld - run: chmod +x bld - - - name: Download the dependencies + - name: Download dependencies run: ./bld download - - name: Run tests with bld + - name: Run tests run: ./bld compile test diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index a2969be..2fb5ff0 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index d136e4d..33a9922 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-1.9.1.jar", + "${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar", "lib/**/*.jar" ] } diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 0ba02e996b4a4240705648c56e024628304a4da1..96e3b3504c0ab176ff12b7348bd523a775ba8bc4 100644 GIT binary patch delta 27497 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 Date: Fri, 26 Jul 2024 19:59:01 -0700 Subject: [PATCH 07/52] Bumped PMD to version 7.4.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 7f6d969..b1d9694 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 3, "SNAPSHOT"); + version = version(1, 1, 3); javaRelease = 17; @@ -39,9 +39,9 @@ public class PmdOperationBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 3, 0); + var pmd = version(7, 4, 0); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 0, "SNAPSHOT"))) + .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) From fec530d26e4f8bf84db70f6d7a57e1ad869cce58 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 28 Jul 2024 20:25:25 -0700 Subject: [PATCH 08/52] Bumped bld to version 2.0.1 --- .idea/bld.xml | 6 ++++++ .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 29519 -> 29577 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 4 ++-- 7 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .idea/bld.xml diff --git a/.idea/bld.xml b/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 2fb5ff0..4dd96bf 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 33a9922..5b2667b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.0.0-SNAPSHOT.jar", + "${HOME}/.bld/dist/bld-2.0.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 35919d7..4f29dea 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/1.9.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pmd/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pmd) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 96e3b3504c0ab176ff12b7348bd523a775ba8bc4..fec2c9a8e0ac75ac4f45f4c3ee5d63936ef998fe 100644 GIT binary patch delta 27394 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 delta 27444 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 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 6db204f..8b07b8b 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,4 +2,4 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -bld.version=2.0.0-SNAPSHOT +bld.version=2.0.1 diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index b1d9694..f214808 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 3); + version = version(1, 1, 4, "SNAPSHOT"); javaRelease = 17; @@ -41,7 +41,7 @@ public class PmdOperationBuild extends Project { var pmd = version(7, 4, 0); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 1))) + .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)) From e63c1a636eb4ec2a1a0ebe52d1729a6bfe94cf9c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 28 Jul 2024 20:55:17 -0700 Subject: [PATCH 09/52] Version 1.1.4 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index f214808..c6b4ca9 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 4, "SNAPSHOT"); + version = version(1, 1, 4); javaRelease = 17; From 2b6b4a5e829a0a38d6a889eca60e8a064b337ae7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 27 Aug 2024 12:55:48 -0700 Subject: [PATCH 10/52] Cleaned up API to match bld operations and options APIs --- .../rife/bld/extension/PmdOperationBuild.java | 9 +- .../java/rife/bld/extension/PmdOperation.java | 143 +++++++++++++----- .../rife/bld/extension/PmdOperationTest.java | 80 ++++++++-- 3 files changed, 180 insertions(+), 52 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index c6b4ca9..ed1ec9a 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 4); + version = version(1, 1, 5, "SNAPSHOT"); javaRelease = 17; @@ -44,11 +44,10 @@ public class PmdOperationBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1))) .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, 13))); + .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 3))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation() diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 8aaea0d..ff67cae 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -142,8 +142,7 @@ public class PmdOperation extends AbstractOperation { * @see #inputPaths(Path...) */ public PmdOperation addInputPaths(Path... inputPath) { - inputPaths_.addAll(List.of(inputPath)); - return this; + return inputPaths(List.of(inputPath)); } /** @@ -154,8 +153,7 @@ public class PmdOperation extends AbstractOperation { * @see #inputPaths(File...) */ public PmdOperation addInputPaths(File... inputPath) { - inputPaths_.addAll(Arrays.stream(inputPath).map(File::toPath).toList()); - return this; + return addInputPathsFiles(List.of(inputPath)); } /** @@ -163,11 +161,10 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath one or more paths * @return this operation - * @see #addInputPaths(String...) + * @see #inputPaths(String...) */ public PmdOperation addInputPaths(String... inputPath) { - inputPaths_.addAll(Arrays.stream(inputPath).map(Paths::get).toList()); - return this; + return addInputPathsStrings(List.of(inputPath)); } /** @@ -182,6 +179,28 @@ public class PmdOperation extends AbstractOperation { return this; } + /** + * Adds paths to source files, or directories containing source files to analyze. + * + * @param inputPath a collection of input paths + * @return this operation + * @see #inputPathsFiles(Collection) + */ + public PmdOperation addInputPathsFiles(Collection inputPath) { + return addInputPaths(inputPath.stream().map(File::toPath).toList()); + } + + /** + * Adds paths to source files, or directories containing source files to analyze. + * + * @param inputPath a collection of input paths + * @return this operation + * @see #inputPathsStrings(Collection) + */ + public PmdOperation addInputPathsStrings(Collection inputPath) { + return addInputPaths(inputPath.stream().map(Paths::get).toList()); + } + /** * Adds new rule set paths. *

      @@ -203,8 +222,7 @@ public class PmdOperation extends AbstractOperation { * @see #ruleSets(String...) */ public PmdOperation addRuleSet(String... ruleSet) { - ruleSets_.addAll(List.of(ruleSet)); - return this; + return addRuleSet(List.of(ruleSet)); } /** @@ -225,7 +243,7 @@ public class PmdOperation extends AbstractOperation { * * @param ruleSet a collection of rule set paths * @return this operation - * @see #ruleSets(Collection + * @see #ruleSets(Collection) */ public PmdOperation addRuleSet(Collection ruleSet) { ruleSets_.addAll(ruleSet); @@ -240,6 +258,21 @@ public class PmdOperation extends AbstractOperation { return this; } + /** + * Sets the location of the cache file for incremental analysis. + */ + public PmdOperation cache(File cache) { + return cache(cache.toPath()); + } + + /** + * Sets the location of the cache file for incremental analysis. + */ + public PmdOperation cache(String cache) { + return cache(Path.of(cache)); + } + + /** * Sets the default language version to be used for all input files. * @@ -247,8 +280,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation defaultLanguageVersions(LanguageVersion... languageVersion) { - languageVersions_.addAll(List.of(languageVersion)); - return this; + return languageVersions(List.of(languageVersion)); } /** @@ -268,8 +300,7 @@ public class PmdOperation extends AbstractOperation { *

      The valid values are the standard character sets of {@link java.nio.charset.Charset Charset}.

      */ public PmdOperation encoding(String encoding) { - encoding_ = Charset.forName(encoding); - return this; + return encoding(Charset.forName(encoding)); } /** @@ -385,8 +416,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation ignoreFile(File ignoreFile) { - ignoreFile_ = ignoreFile.toPath(); - return this; + return ignoreFile(ignoreFile.toPath()); } /** @@ -396,8 +426,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation ignoreFile(String ignoreFile) { - ignoreFile_ = Paths.get(ignoreFile); - return this; + return ignoreFile(Path.of(ignoreFile)); } /** @@ -495,9 +524,7 @@ public class PmdOperation extends AbstractOperation { * @see #addInputPaths(Path...) */ public PmdOperation inputPaths(Path... inputPath) { - inputPaths_.clear(); - inputPaths_.addAll(List.of(inputPath)); - return this; + return inputPaths(List.of(inputPath)); } /** @@ -510,9 +537,7 @@ public class PmdOperation extends AbstractOperation { * @see #addInputPaths(File...) */ public PmdOperation inputPaths(File... inputPath) { - inputPaths_.clear(); - inputPaths_.addAll(Arrays.stream(inputPath).map(File::toPath).toList()); - return this; + return inputPathsFiles(List.of(inputPath)); } /** @@ -525,9 +550,7 @@ public class PmdOperation extends AbstractOperation { * @see #addInputPaths(String...) */ public PmdOperation inputPaths(String... inputPath) { - inputPaths_.clear(); - inputPaths_.addAll(Arrays.stream(inputPath).map(Paths::get).toList()); - return this; + return inputPathsStrings(List.of(inputPath)); } /** @@ -537,7 +560,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath a collection of input paths * @return this operation - * @see #addInputPaths(Collection) + * @see #addInputPaths(Path...) */ public PmdOperation inputPaths(Collection inputPath) { inputPaths_.clear(); @@ -554,6 +577,32 @@ public class PmdOperation extends AbstractOperation { return inputPaths_; } + /** + * Sets paths to source files, or directories containing source files to analyze. + *

      + * Previous entries are disregarded. + * + * @param inputPath a collection of input paths + * @return this operation + * @see #addInputPaths(File...) + */ + public PmdOperation inputPathsFiles(Collection inputPath) { + return inputPaths(inputPath.stream().map(File::toPath).toList()); + } + + /** + * Sets paths to source files, or directories containing source files to analyze. + *

      + * Previous entries are disregarded. + * + * @param inputPath a collection of input paths + * @return this operation + * @see #addInputPaths(String...) + */ + public PmdOperation inputPathsStrings(Collection inputPath) { + return inputPaths(inputPath.stream().map(Paths::get).toList()); + } + /** * Sets the default language versions. * @@ -561,8 +610,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation languageVersions(LanguageVersion... languageVersion) { - languageVersions_.addAll(List.of(languageVersion)); - return this; + return languageVersions(List.of(languageVersion)); } /** @@ -667,10 +715,10 @@ public class PmdOperation extends AbstractOperation { * * @param relativeRoot one or more relative root paths * @return this operations + * @see #relativizeRoots(Collection) */ public PmdOperation relativizeRoots(Path... relativeRoot) { - relativizeRoots_.addAll(List.of(relativeRoot)); - return this; + return relativizeRoots(List.of(relativeRoot)); } /** @@ -678,10 +726,10 @@ public class PmdOperation extends AbstractOperation { * * @param relativeRoot one or more relative root paths * @return this operations + * @see #relativizeRootsFiles(Collection) */ public PmdOperation relativizeRoots(File... relativeRoot) { - relativizeRoots_.addAll(Arrays.stream(relativeRoot).map(File::toPath).toList()); - return this; + return relativizeRootsFiles(List.of(relativeRoot)); } /** @@ -689,10 +737,10 @@ public class PmdOperation extends AbstractOperation { * * @param relativeRoot one or more relative root paths * @return this operations + * @see #relativizeRootsStrings(Collection) */ public PmdOperation relativizeRoots(String... relativeRoot) { - relativizeRoots_.addAll(Arrays.stream(relativeRoot).map(Paths::get).toList()); - return this; + return relativizeRootsStrings(List.of(relativeRoot)); } /** @@ -700,6 +748,7 @@ public class PmdOperation extends AbstractOperation { * * @param relativeRoot a collection of relative root paths * @return this operations + * @see #relativizeRoots(Path...) */ public PmdOperation relativizeRoots(Collection relativeRoot) { relativizeRoots_.addAll(relativeRoot); @@ -715,6 +764,28 @@ public class PmdOperation extends AbstractOperation { return relativizeRoots_; } + /** + * Adds several paths to shorten paths that are output in the report. + * + * @param relativeRoot a collection of relative root paths + * @return this operations + * @see #relativizeRoots(File...) + */ + public PmdOperation relativizeRootsFiles(Collection relativeRoot) { + return relativizeRoots(relativeRoot.stream().map(File::toPath).toList()); + } + + /** + * Adds several paths to shorten paths that are output in the report. + * + * @param relativeRoot a collection of relative root paths + * @return this operations + * @see #relativizeRoots(String...) + */ + public PmdOperation relativizeRootsStrings(Collection relativeRoot) { + return relativizeRoots(relativeRoot.stream().map(Paths::get).toList()); + } + /** * Sets the path to the report page. * diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index 6d042a7..d9e08fb 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -61,13 +61,13 @@ class PmdOperationTest { PmdOperation newPmdOperation() { return new PmdOperation() .inputPaths(Path.of("src/main"), Path.of("src/test")) - .cache(Paths.get("build", COMMAND_NAME, "pmd-cache")) + .cache("build/" + COMMAND_NAME + "/pmd-cache") .failOnViolation(false) .reportFile(Paths.get("build", COMMAND_NAME, "pmd-test-report.txt")); } @Test - void testAddInputPath() throws ExitStatusException { + void testAddInputPaths() throws ExitStatusException { var project = new BaseProject(); var pmd = new PmdOperation().fromProject(project); @@ -82,17 +82,35 @@ class PmdOperationTest { assertThat(pmd.inputPaths()).as("main").containsExactly(project.srcMainDirectory().toPath()); pmd.inputPaths().clear(); - pmd.addInputPaths(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + pmd = pmd.addInputPaths(project.srcMainDirectory(), project.srcTestDirectory()); - assertThat(pmd.inputPaths()).as("toPath(main, test)").containsExactly(project.srcMainDirectory().toPath(), + assertThat(pmd.inputPaths()).as("main, test").containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); pmd.inputPaths().clear(); - pmd.addInputPaths(List.of(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath())); + pmd = pmd.addInputPathsFiles(List.of(project.srcMainDirectory(), project.srcTestDirectory())); - assertThat(pmd.inputPaths()).as("List(main, test)").containsExactly( - project.srcMainDirectory().toPath(), - project.srcTestDirectory().toPath()); + assertThat(pmd.inputPaths()).as("PathsFiles(main, test)") + .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + + pmd.inputPaths().clear(); + pmd = pmd.addInputPathsStrings( + List.of(project.srcMainDirectory().getAbsolutePath(), project.srcTestDirectory().getAbsolutePath())); + + assertThat(pmd.inputPaths()).as("PathsStrings(main, test)") + .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + + pmd.inputPaths().clear(); + pmd = pmd.addInputPaths(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + + assertThat(pmd.inputPaths()).as("toPath(main, test)") + .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + + pmd.inputPaths().clear(); + pmd = pmd.addInputPaths(List.of(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath())); + + assertThat(pmd.inputPaths()).as("List(main, test)") + .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .isGreaterThan(0).isEqualTo(err); @@ -124,7 +142,10 @@ class PmdOperationTest { @Test void testCache() throws ExitStatusException { var cache = Path.of("build/pmd/temp-cache"); - var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML).inputPaths(List.of(CODE_STYLE_SAMPLE)).cache(cache); + var pmd = newPmdOperation() + .ruleSets(CODE_STYLE_XML) + .inputPaths(List.of(CODE_STYLE_SAMPLE)) + .cache(cache); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); var f = cache.toFile(); assertThat(f.exists()).as("file exits").isTrue(); @@ -213,7 +234,31 @@ class PmdOperationTest { var pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPaths(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); - assertThat(pmd.inputPaths()).contains(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("paths").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); + + pmd = newPmdOperation() + .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) + .inputPaths(ERROR_PRONE_SAMPLE.toFile(), CODE_STYLE_SAMPLE.toFile()); + assertThat(pmd.inputPaths()).as("toFile()").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); + + pmd = newPmdOperation() + .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) + .inputPaths(ERROR_PRONE_SAMPLE.toString(), CODE_STYLE_SAMPLE.toString()); + assertThat(pmd.inputPaths()).as("toString").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); + + pmd = newPmdOperation() + .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) + .inputPathsFiles(List.of(ERROR_PRONE_SAMPLE.toFile(), CODE_STYLE_SAMPLE.toFile())); + assertThat(pmd.inputPaths()).as("PathsFiles").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); + + pmd = newPmdOperation() + .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) + .inputPathsStrings(List.of(ERROR_PRONE_SAMPLE.toString(), CODE_STYLE_SAMPLE.toString())); + assertThat(pmd.inputPaths()).as("PathsStrings").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @@ -235,6 +280,7 @@ class PmdOperationTest { var pmd = newPmdOperation().ruleSets(CODE_STYLE_XML).inputPaths(CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .as("code style").isGreaterThan(0); + pmd = pmd.ruleSets(ERROR_PRONE_XML).inputPaths(ERROR_PRONE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) .as("code style + error prone").isGreaterThan(0); @@ -245,7 +291,7 @@ class PmdOperationTest { var pmd = newPmdOperation() .ruleSets(DESIGN_XML) .inputPaths("src/test/resources/java/Design.java") - .cache(Path.of("build/pmd/design-cache")); + .cache(new File("build/pmd/design-cache")); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @@ -336,6 +382,18 @@ class PmdOperationTest { var config = pmd.initConfiguration(COMMAND_NAME); assertThat(config.getRelativizeRoots()).isEqualTo(pmd.relativizeRoots()); assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz, foo, bar, baz); + + pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) + .relativizeRootsFiles(List.of(foo.toFile(), bar.toFile(), baz.toFile())); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getRelativizeRoots()).as("toFile").isEqualTo(pmd.relativizeRoots()); + assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); + + pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) + .relativizeRootsStrings(List.of(foo.toString(), bar.toString(), baz.toString())); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getRelativizeRoots()).as("toString").isEqualTo(pmd.relativizeRoots()); + assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); } @Test From 3e18345efe3d439a80918621dbe468a4ba3e915a Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 29 Aug 2024 21:57:24 -0700 Subject: [PATCH 11/52] Bumped bld to version 2.1.0 --- .idea/libraries/bld.xml | 4 ++-- .idea/libraries/compile.xml | 4 ++-- .idea/libraries/runtime.xml | 4 ++-- .idea/libraries/test.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 29577 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 4dd96bf..5c4010c 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 9bd86aa..99cc0c0 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index 81feb0b..56ddbf1 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index 13b6513..f72f7a3 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b2667b..4c33beb 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.0.1.jar", + "${HOME}/.bld/dist/bld-2.1.0.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 4f29dea..00dbca3 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.0.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pmd/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pmd) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index fec2c9a8e0ac75ac4f45f4c3ee5d63936ef998fe..3133172c83965f4deeb5ac55a4e662cbbf054ea9 100644 GIT binary patch delta 15855 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

      s$*rls@!sHBO;ZCZI;P{yKGwD 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 L_^*Fz5Rm@|(nu+4 diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 8b07b8b..e011e70 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,4 +2,4 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -bld.version=2.0.1 +bld.version=2.1.0 diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index ed1ec9a..d37be67 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -41,7 +41,7 @@ public class PmdOperationBuild extends Project { var pmd = version(7, 4, 0); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(2, 0, 1))) + .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); From 176929cd290687d9f9fb112a79e4cab5b4921c49 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 30 Aug 2024 11:00:20 -0700 Subject: [PATCH 12/52] Bumped PMD to version 7.5.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index d37be67..beea01b 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -39,7 +39,7 @@ public class PmdOperationBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 4, 0); + var pmd = version(7, 5, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 47c0b14ce9e6c1dae0f46e5c2ff55aea01d0129e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 30 Aug 2024 11:38:44 -0700 Subject: [PATCH 13/52] Minor cleanups --- .../java/rife/bld/extension/PmdOperation.java | 16 +++----- .../rife/bld/extension/PmdOperationTest.java | 38 ++++++++++--------- 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index ff67cae..5b4cfde 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -560,7 +560,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath a collection of input paths * @return this operation - * @see #addInputPaths(Path...) + * @see #addInputPaths(Collection) */ public PmdOperation inputPaths(Collection inputPath) { inputPaths_.clear(); @@ -584,7 +584,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath a collection of input paths * @return this operation - * @see #addInputPaths(File...) + * @see #addInputPathsFiles(Collection) ) */ public PmdOperation inputPathsFiles(Collection inputPath) { return inputPaths(inputPath.stream().map(File::toPath).toList()); @@ -597,7 +597,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath a collection of input paths * @return this operation - * @see #addInputPaths(String...) + * @see #addInputPathsStrings(Collection) */ public PmdOperation inputPathsStrings(Collection inputPath) { return inputPaths(inputPath.stream().map(Paths::get).toList()); @@ -804,8 +804,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation reportFile(File reportFile) { - reportFile_ = reportFile.toPath(); - return this; + return reportFile(reportFile.toPath()); } /** @@ -815,8 +814,7 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PmdOperation reportFile(String reportFile) { - reportFile_ = Paths.get(reportFile); - return this; + return reportFile(Paths.get(reportFile)); } /** @@ -871,9 +869,7 @@ public class PmdOperation extends AbstractOperation { * @see #addRuleSet(String...) */ public PmdOperation ruleSets(String... ruleSet) { - ruleSets_.clear(); - ruleSets_.addAll(List.of(ruleSet)); - return this; + return ruleSets(List.of(ruleSet)); } /** diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index d9e08fb..80f7169 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -76,40 +76,42 @@ class PmdOperationTest { var err = pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME)); - pmd.inputPaths().clear(); - pmd.addInputPaths(project.srcMainDirectory()); - - assertThat(pmd.inputPaths()).as("main").containsExactly(project.srcMainDirectory().toPath()); - pmd.inputPaths().clear(); pmd = pmd.addInputPaths(project.srcMainDirectory(), project.srcTestDirectory()); - assertThat(pmd.inputPaths()).as("main, test").containsExactly(project.srcMainDirectory().toPath(), + assertThat(pmd.inputPaths()).as("File...").containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); pmd.inputPaths().clear(); pmd = pmd.addInputPathsFiles(List.of(project.srcMainDirectory(), project.srcTestDirectory())); - assertThat(pmd.inputPaths()).as("PathsFiles(main, test)") + assertThat(pmd.inputPaths()).as("List(File...)") + .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); + + pmd.inputPaths().clear(); + pmd = pmd.addInputPaths(project.srcMainDirectory().getAbsolutePath(), + project.srcTestDirectory().getAbsolutePath()); + + assertThat(pmd.inputPaths()).as("String...") .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); pmd.inputPaths().clear(); pmd = pmd.addInputPathsStrings( List.of(project.srcMainDirectory().getAbsolutePath(), project.srcTestDirectory().getAbsolutePath())); - assertThat(pmd.inputPaths()).as("PathsStrings(main, test)") + assertThat(pmd.inputPaths()).as("List(String...)") .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); pmd.inputPaths().clear(); pmd = pmd.addInputPaths(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); - assertThat(pmd.inputPaths()).as("toPath(main, test)") + assertThat(pmd.inputPaths()).as("Path...") .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); pmd.inputPaths().clear(); pmd = pmd.addInputPaths(List.of(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath())); - assertThat(pmd.inputPaths()).as("List(main, test)") + assertThat(pmd.inputPaths()).as("List(Path)") .containsExactly(project.srcMainDirectory().toPath(), project.srcTestDirectory().toPath()); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))) @@ -234,31 +236,31 @@ class PmdOperationTest { var pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPaths(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); - assertThat(pmd.inputPaths()).as("paths").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("Path....").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPaths(ERROR_PRONE_SAMPLE.toFile(), CODE_STYLE_SAMPLE.toFile()); - assertThat(pmd.inputPaths()).as("toFile()").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("File...").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPaths(ERROR_PRONE_SAMPLE.toString(), CODE_STYLE_SAMPLE.toString()); - assertThat(pmd.inputPaths()).as("toString").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("String...").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPathsFiles(List.of(ERROR_PRONE_SAMPLE.toFile(), CODE_STYLE_SAMPLE.toFile())); - assertThat(pmd.inputPaths()).as("PathsFiles").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("List(Path...)").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); pmd = newPmdOperation() .ruleSets(PmdOperation.RULE_SET_DEFAULT, CODE_STYLE_XML) .inputPathsStrings(List.of(ERROR_PRONE_SAMPLE.toString(), CODE_STYLE_SAMPLE.toString())); - assertThat(pmd.inputPaths()).as("PathsStrings").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); + assertThat(pmd.inputPaths()).as("List(String...)").containsExactly(ERROR_PRONE_SAMPLE, CODE_STYLE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); } @@ -347,7 +349,7 @@ class PmdOperationTest { var pmd = newPmdOperation() .forceLanguageVersion(language.getLatestVersion()) .defaultLanguageVersions(language.getVersions()) - .languageVersions(language.getVersion("22")) + .languageVersions(language.getDefaultVersion()) .ruleSets(PmdOperation.RULE_SET_DEFAULT); assertThat(pmd.languageVersions()).contains(language.getDefaultVersion()); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); @@ -386,13 +388,13 @@ class PmdOperationTest { pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) .relativizeRootsFiles(List.of(foo.toFile(), bar.toFile(), baz.toFile())); config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getRelativizeRoots()).as("toFile").isEqualTo(pmd.relativizeRoots()); + assertThat(config.getRelativizeRoots()).as("List(File...)").isEqualTo(pmd.relativizeRoots()); assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) .relativizeRootsStrings(List.of(foo.toString(), bar.toString(), baz.toString())); config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getRelativizeRoots()).as("toString").isEqualTo(pmd.relativizeRoots()); + assertThat(config.getRelativizeRoots()).as("List(String....)").isEqualTo(pmd.relativizeRoots()); assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); } From d20f3e41b8fb051d32a4cd4d74fdc28d49a13f43 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 30 Aug 2024 11:43:07 -0700 Subject: [PATCH 14/52] Version 1.1.5 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index beea01b..eb8eda4 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 5, "SNAPSHOT"); + version = version(1, 1, 5); javaRelease = 17; From a986add8ee7c8e0077f59d6a5c263472b958dd8f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:26:17 -0700 Subject: [PATCH 15/52] Bumped JUnit to version 5.11.1 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index eb8eda4..2f5b91a 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -46,8 +46,8 @@ public class PmdOperationBuild extends Project { scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 1))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation() From 22b7ab9220e4f55dac455b3dafdee3e5bc9f8df7 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:29:43 -0700 Subject: [PATCH 16/52] Bumped PMD to version 7.6.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 2f5b91a..d22e068 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -39,7 +39,7 @@ public class PmdOperationBuild extends Project { autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 5, 0); + var pmd = version(7, 6, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 3b0550add2c4198cb5e827dd166999692fead2dc Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:31:20 -0700 Subject: [PATCH 17/52] Added GitHub repository --- .../rife/bld/extension/PmdOperationBuild.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index d22e068..dc92299 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -37,6 +37,7 @@ public class PmdOperationBuild extends Project { downloadSources = true; autoDownloadPurge = true; + repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); var pmd = version(7, 6, 0); @@ -59,29 +60,26 @@ public class PmdOperationBuild extends Project { .link("https://javadoc.io/doc/net.sourceforge.pmd/pmd-core/latest/"); publishOperation() - // .repository(MAVEN_LOCAL) .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) + .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId("bld-pmd") .description("bld Extension to Perform Static Code Analysis with PMD") .url("https://github.com/rife2/bld-pmd") - .developer( - new PublishDeveloper() - .id("ethauvin").name("Erik C. Thauvin") - .email("erik@thauvin.net") - .url("https://erik.thauvin.net/") + .developer(new PublishDeveloper() + .id("ethauvin").name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/") ) - .license( - new PublishLicense() - .name("The Apache License, Version 2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.txt") + .license(new PublishLicense() + .name("The Apache License, Version 2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) - .scm( - new PublishScm() - .connection("scm:git:https://github.com/rife2/bld-pmd.git") - .developerConnection("scm:git:git@github.com:rife2/bld-pmd.git") - .url("https://github.com/rife2/bld-pmd") + .scm(new PublishScm() + .connection("scm:git:https://github.com/rife2/bld-pmd.git") + .developerConnection("scm:git:git@github.com:rife2/bld-pmd.git") + .url("https://github.com/rife2/bld-pmd") ) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); From 592c0c514d6c6162bbbe8c26ac5c4d595a210896 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:31:57 -0700 Subject: [PATCH 18/52] Cleaned up tests --- .../rife/bld/extension/PmdOperationTest.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index 80f7169..be3894e 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -19,6 +19,7 @@ package rife.bld.extension; import net.sourceforge.pmd.PMDConfiguration; import net.sourceforge.pmd.lang.LanguageRegistry; import net.sourceforge.pmd.lang.rule.RulePriority; +import org.assertj.core.api.AutoCloseableSoftAssertions; import org.junit.jupiter.api.Test; import rife.bld.BaseProject; import rife.bld.operations.exceptions.ExitStatusException; @@ -382,20 +383,20 @@ class PmdOperationTest { var pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)).relativizeRoots(foo).relativizeRoots(bar.toFile()) .relativizeRoots(baz.toString()).relativizeRoots(List.of(foo, bar, baz)); var config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getRelativizeRoots()).isEqualTo(pmd.relativizeRoots()); - assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz, foo, bar, baz); + assertThat(config.getRelativizeRoots()).isEqualTo(pmd.relativizeRoots()) + .containsExactly(foo, bar, baz, foo, bar, baz); pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) .relativizeRootsFiles(List.of(foo.toFile(), bar.toFile(), baz.toFile())); config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getRelativizeRoots()).as("List(File...)").isEqualTo(pmd.relativizeRoots()); - assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); + assertThat(config.getRelativizeRoots()).as("List(File...)").isEqualTo(pmd.relativizeRoots()) + .containsExactly(foo, bar, baz); pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) .relativizeRootsStrings(List.of(foo.toString(), bar.toString(), baz.toString())); config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getRelativizeRoots()).as("List(String....)").isEqualTo(pmd.relativizeRoots()); - assertThat(config.getRelativizeRoots()).containsExactly(foo, bar, baz); + assertThat(config.getRelativizeRoots()).as("List(String....)").isEqualTo(pmd.relativizeRoots()) + .containsExactly(foo, bar, baz); } @Test @@ -419,8 +420,11 @@ class PmdOperationTest { void testReportFormat() throws IOException, ExitStatusException { var pmd = newPmdOperation().ruleSets(ERROR_PRONE_XML).reportFormat("xml").inputPaths(ERROR_PRONE_SAMPLE); assertThat(pmd.performPmdAnalysis(TEST, pmd.initConfiguration(COMMAND_NAME))).isGreaterThan(0); - try (var br = Files.newBufferedReader(pmd.reportFile())) { - assertThat(br.readLine()).as("xml report").startsWith(""); + try (var softly = new AutoCloseableSoftAssertions()) { + try (var br = Files.newBufferedReader(pmd.reportFile())) { + softly.assertThat(br.readLine()).as("xml report") + .startsWith(""); + } } } From f46d75c2fedd0fb41d4fd06ab07ae57467154332 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:34:30 -0700 Subject: [PATCH 19/52] Version 1.1.6 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index dc92299..f0eeace 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 5); + version = version(1, 1, 6); javaRelease = 17; From 5c33fd2a1592f96b9497612065d4f04465b9c88e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Oct 2024 11:53:21 -0700 Subject: [PATCH 20/52] Bumped JDK to version 23 (GitHub CI testing) --- .github/workflows/bld.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index bf65051..f7e10f8 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - java-version: [17, 21, 22] + java-version: [17, 21, 23] steps: - name: Checkout source repository From 4af11d862bf0ad55afd2bcbb809ac2020c12455c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Oct 2024 11:54:20 -0700 Subject: [PATCH 21/52] Bumped JUnit to version 5.11.3 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index f0eeace..409c982 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -47,8 +47,8 @@ public class PmdOperationBuild extends Project { scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 1))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 1))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation() From c7e5731d9e37f8b51f634ba8273ba64ef29d7457 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Oct 2024 11:54:47 -0700 Subject: [PATCH 22/52] Bumped PMD to version 7.7.0 --- config/pmd.xml | 4 ++-- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/pmd.xml b/config/pmd.xml index 3d3203c..2641880 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -7,9 +7,9 @@ - - + + diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 409c982..8c8bd5e 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 6, 0); + var pmd = version(7, 7, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From f58d4ac052d1f62e353a5b762a0ad7571fdfb915 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Oct 2024 12:11:31 -0700 Subject: [PATCH 23/52] Version 1.1.7 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 8c8bd5e..c7e57d6 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 6); + version = version(1, 1, 7); javaRelease = 17; From 21edab586bf173aefcb26e44802bf70ae09f6079 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 29 Nov 2024 07:33:22 -0800 Subject: [PATCH 24/52] Bumped PMD to version 7.8.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index c7e57d6..ad9c788 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 7, 0); + var pmd = version(7, 8, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 586e4a0e19c8ac09aa4404973546fc137042272f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 29 Nov 2024 07:37:53 -0800 Subject: [PATCH 25/52] Version 1.1.8 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index ad9c788..9e7e209 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 7); + version = version(1, 1, 8); javaRelease = 17; From dfdc311607c7788a594ea94c565e05e0b2581754 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 27 Dec 2024 07:18:32 -0800 Subject: [PATCH 26/52] Updated dependencies Bumped PMD to version 7.9.0 Bumped JUnit to version 5.11.4 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 9e7e209..fec016b 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,16 +40,16 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 8, 0); + var pmd = version(7, 9, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 3))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 3))) - .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) + .include(dependency("org.assertj", "assertj-core", version(3, 27, 0))); javadocOperation() .javadocOptions() From e7b366eaf0032d5ac0ade2b3d4e543aae53756fd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 27 Dec 2024 07:19:07 -0800 Subject: [PATCH 27/52] Version 1.1.9 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index fec016b..96c971f 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 8); + version = version(1, 1, 9); javaRelease = 17; From 9184979e2ffaf5bab1d8c48d9c79ee30dd8b9e70 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Jan 2025 07:55:21 -0800 Subject: [PATCH 28/52] Bumped bld to version 2.2.0 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 5c4010c..553c281 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c33beb..a3f4fd0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.0.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 00dbca3..0bdcd9e 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pmd/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pmd) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index 3133172c83965f4deeb5ac55a4e662cbbf054ea9..ed94afd16519c4e36ee7021c1d0bf621cbef8bb2 100644 GIT binary patch delta 203 zcmaFymhr_~M!o=VW)=|!4h{~6zZ12iCi2y?fas0=CN^NkqnshM0T=HiJZzMV+Mu*Z+4E3GxFi=3=9mcKpf!B$Rxsmuy1l+ qi4(-0EhQdc#-!3 Date: Mon, 13 Jan 2025 07:57:34 -0800 Subject: [PATCH 29/52] Updated copyright for 2025 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- src/main/java/rife/bld/extension/PmdOperation.java | 2 +- src/test/java/rife/bld/extension/PmdOperationTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index c614973..96211ca 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 5b4cfde..0e5ef6f 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index be3894e..08df70f 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 682c50e949ca076477d6d518941be1e71166244c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Jan 2025 07:59:28 -0800 Subject: [PATCH 30/52] Version 1.1.10-SNAPSHOT --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 96211ca..ea86861 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 9); + version = version(1, 1, 10, "SNAPSHOT"); javaRelease = 17; From 28f9d29d9af396244167c0ee08913ac02509ead4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 14 Jan 2025 10:11:41 -0800 Subject: [PATCH 31/52] Version 1.1.10 --- .idea/icon.svg | 13 +++++++++++++ .../java/rife/bld/extension/PmdOperationBuild.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .idea/icon.svg diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..81220b4 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index ea86861..eb43550 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 10, "SNAPSHOT"); + version = version(1, 1, 10); javaRelease = 17; From 71253717bf427a8a84d4c47e257959f4527aa75e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 Jan 2025 14:00:22 -0800 Subject: [PATCH 32/52] Bumped artifact and pages actions to the latest versions --- .github/workflows/pages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index bf43624..508f6a5 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -47,11 +47,11 @@ jobs: uses: actions/configure-pages@v3 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: # Upload generated Javadocs repository path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 + uses: actions/deploy-pages@v4 From bc60dcbcf856ac73eb18848323a11795055578f8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 Jan 2025 14:00:57 -0800 Subject: [PATCH 33/52] Bumped AssertJ to version 3.27.3 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index eb43550..d7c18ec 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -49,7 +49,7 @@ public class PmdOperationBuild extends Project { scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) - .include(dependency("org.assertj", "assertj-core", version(3, 27, 2))); + .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() .javadocOptions() From a1d0b30968ce16caae100f4c67300e08adbff1f8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 Jan 2025 14:03:39 -0800 Subject: [PATCH 34/52] Added missing prepend classpath and excludes options --- .../java/rife/bld/extension/PmdOperation.java | 127 +++++++++++++++--- .../rife/bld/extension/PmdOperationTest.java | 24 ++++ 2 files changed, 136 insertions(+), 15 deletions(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index 0e5ef6f..aa0a61d 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -49,6 +49,10 @@ 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 list of paths to exclude. + */ + private final List excludes_ = new ArrayList<>(); /** * The input paths (source) list. */ @@ -101,6 +105,10 @@ public class PmdOperation extends AbstractOperation { * The default language version(s). */ private Collection languageVersions_ = new ArrayList<>(); + /** + * The classpath to prepend. + */ + private String prependClasspath_; /** * The project reference. */ @@ -272,7 +280,6 @@ public class PmdOperation extends AbstractOperation { return cache(Path.of(cache)); } - /** * Sets the default language version to be used for all input files. * @@ -314,6 +321,37 @@ public class PmdOperation extends AbstractOperation { return this; } + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + */ + public PmdOperation excludes(Path... excludes) { + excludes_.addAll(List.of(excludes)); + return this; + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes paths to exclude + * @return this operation + */ + public PmdOperation excludes(Collection excludes) { + excludes_.addAll(excludes); + return this; + } + + /** + * Returns the paths to exclude from the analysis. + * + * @return the exclude paths + */ + public List excludes() { + return excludes_; + } + /** * Performs the PMD code analysis operation. */ @@ -456,8 +494,17 @@ public class PmdOperation extends AbstractOperation { * @return this operation */ public PMDConfiguration initConfiguration(String commandName) { - PMDConfiguration config = new PMDConfiguration(); + var config = new PMDConfiguration(); + // addRelativizeRoots + config.addRelativizeRoots(relativizeRoots_.stream().toList()); + + // prependAuxClasspath + if (prependClasspath_ != null) { + config.prependAuxClasspath(prependClasspath_); + } + + // setAnalysisCacheLocation if (cache_ == null && project_ != null && incrementalAnalysis_) { config.setAnalysisCacheLocation( Paths.get(project_.buildDirectory().getPath(), PMD_DIR, PMD_DIR + "-cache").toFile().getAbsolutePath()); @@ -465,38 +512,50 @@ public class PmdOperation extends AbstractOperation { config.setAnalysisCacheLocation(cache_.toFile().getAbsolutePath()); } - config.setFailOnError(failOnError_); - config.setFailOnViolation(failOnViolation_); - + // setDefaultLanguageVersions if (languageVersions_ != null) { config.setDefaultLanguageVersions(languageVersions_.stream().toList()); } + // setExcludes + if (!excludes_.isEmpty()) { + config.setExcludes(excludes_); + } + + // setFailOnError + config.setFailOnError(failOnError_); + // setFailOnViolation + config.setFailOnViolation(failOnViolation_); + + // setForceLanguageVersion if (forcedLanguageVersion_ != null) { config.setForceLanguageVersion(forcedLanguageVersion_); } + // setIgnoreFilePath if (ignoreFile_ != null) { config.setIgnoreFilePath(ignoreFile_); } + // setIgnoreIncrementalAnalysis config.setIgnoreIncrementalAnalysis(!incrementalAnalysis_); + // setInputPathList if (inputPaths_.isEmpty()) { throw new IllegalArgumentException(commandName + ": InputPaths required."); } else { config.setInputPathList(inputPaths_.stream().toList()); } - if (reportProperties_ != null) { - config.setReportProperties(reportProperties_); - } + // setInputUri if (inputUri_ != null) { config.setInputUri(inputUri_); } + // setMinimumPriority config.setMinimumPriority(rulePriority_); + // setReportFile if (project_ != null) { config.setReportFile(Objects.requireNonNullElseGet(reportFile_, () -> Paths.get(project_.buildDirectory().getPath(), @@ -505,12 +564,25 @@ public class PmdOperation extends AbstractOperation { config.setReportFile(reportFile_); } - config.addRelativizeRoots(relativizeRoots_.stream().toList()); + // setReportFormat config.setReportFormat(reportFormat_); + + // setReportProperties + if (reportProperties_ != null) { + config.setReportProperties(reportProperties_); + } + + // setRuleSets config.setRuleSets(ruleSets_.stream().toList()); + + // setShowSuppressedViolations config.setShowSuppressedViolations(showSuppressed_); + // setSourceEncoding config.setSourceEncoding(encoding_); + // setSuppressMarker config.setSuppressMarker(suppressedMarker_); + + // setThreads config.setThreads(threads_); return config; @@ -710,11 +782,36 @@ public class PmdOperation extends AbstractOperation { return numViolations; } + /** + * Prepend the specified classpath like string to the current ClassLoader of the configuration. If no ClassLoader + * is currently configured, the ClassLoader used to load the PMDConfiguration class will be used as the parent + * ClassLoader of the created ClassLoader. + *

      + * If the classpath String looks like a URL to a file (i.e. starts with {@code file://}) the file will be read with + * each line representing an entry on the classpath. + * + * @param classpath one or more classpath + * @return this operation + */ + public PmdOperation prependAuxClasspath(String... classpath) { + prependClasspath_ = String.join(File.pathSeparator, classpath); + return this; + } + + /** + * Returns the prepended classpath. + * + * @return the classpath + */ + public String prependAuxClasspath() { + return prependClasspath_; + } + /** * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot one or more relative root paths - * @return this operations + * @return this operation * @see #relativizeRoots(Collection) */ public PmdOperation relativizeRoots(Path... relativeRoot) { @@ -725,7 +822,7 @@ public class PmdOperation extends AbstractOperation { * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot one or more relative root paths - * @return this operations + * @return this operation * @see #relativizeRootsFiles(Collection) */ public PmdOperation relativizeRoots(File... relativeRoot) { @@ -736,7 +833,7 @@ public class PmdOperation extends AbstractOperation { * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot one or more relative root paths - * @return this operations + * @return this operation * @see #relativizeRootsStrings(Collection) */ public PmdOperation relativizeRoots(String... relativeRoot) { @@ -747,7 +844,7 @@ public class PmdOperation extends AbstractOperation { * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot a collection of relative root paths - * @return this operations + * @return this operation * @see #relativizeRoots(Path...) */ public PmdOperation relativizeRoots(Collection relativeRoot) { @@ -768,7 +865,7 @@ public class PmdOperation extends AbstractOperation { * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot a collection of relative root paths - * @return this operations + * @return this operation * @see #relativizeRoots(File...) */ public PmdOperation relativizeRootsFiles(Collection relativeRoot) { @@ -779,7 +876,7 @@ public class PmdOperation extends AbstractOperation { * Adds several paths to shorten paths that are output in the report. * * @param relativeRoot a collection of relative root paths - * @return this operations + * @return this operation * @see #relativizeRoots(String...) */ public PmdOperation relativizeRootsStrings(Collection relativeRoot) { diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index 08df70f..48545e5 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -166,6 +166,24 @@ class PmdOperationTest { assertThat(config.getSourceEncoding()).as("ISO_8859").isEqualTo(StandardCharsets.ISO_8859_1); } + @Test + void testExcludes() { + var foo = Path.of("foo/bar"); + var bar = Path.of("bar/foo"); + var foz = Path.of("foz/baz"); + var baz = Path.of("baz/foz"); + + var excludes = List.of(foo, bar); + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludes(excludes); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(excludes.toArray(new Path[0])); + + pmd = pmd.excludes(baz, foz); + assertThat(pmd.excludes()).hasSize(4); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).hasSize(4).contains(bar, foz); + } + @Test void testExecute() throws ExitStatusException { var pmd = new PmdOperation().fromProject(new BaseProject()); @@ -368,6 +386,12 @@ class PmdOperationTest { assertThat(pmd).isEqualTo(0); } + @Test + void testPrependAuxClasspath() { + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).prependAuxClasspath("foo", "bar"); + assertThat(pmd.prependAuxClasspath()).isEqualTo("foo" + File.pathSeparator + "bar"); + } + @Test void testPriority() throws ExitStatusException { var pmd = newPmdOperation().inputPaths(CODE_STYLE_SAMPLE).minimumPriority(RulePriority.HIGH); From e7fac3130b78dbb7d1a710bda9c103678a9f142c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 Jan 2025 14:04:08 -0800 Subject: [PATCH 35/52] Bumped PMD to version 7.10.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index d7c18ec..bb7319c 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 9, 0); + var pmd = version(7, 10, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 25bce33323f205f7ab6030ca1931f995c9f4f0b5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 31 Jan 2025 14:07:34 -0800 Subject: [PATCH 36/52] Version 1.1.11 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index bb7319c..616d5d5 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 10); + version = version(1, 1, 11); javaRelease = 17; From af25b2f5073dd22dc99cf7d0901ea0920dac27c3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 1 Feb 2025 12:47:55 -0800 Subject: [PATCH 37/52] BREAKING: reworked excludes methods and added addExcludes methods --- .../java/rife/bld/extension/PmdOperation.java | 140 +++++++++++++++++- .../rife/bld/extension/PmdOperationTest.java | 113 +++++++++++--- 2 files changed, 226 insertions(+), 27 deletions(-) diff --git a/src/main/java/rife/bld/extension/PmdOperation.java b/src/main/java/rife/bld/extension/PmdOperation.java index aa0a61d..25b25c6 100644 --- a/src/main/java/rife/bld/extension/PmdOperation.java +++ b/src/main/java/rife/bld/extension/PmdOperation.java @@ -52,7 +52,7 @@ public class PmdOperation extends AbstractOperation { /** * The list of paths to exclude. */ - private final List excludes_ = new ArrayList<>(); + private final Collection excludes_ = new ArrayList<>(); /** * The input paths (source) list. */ @@ -142,6 +142,79 @@ public class PmdOperation extends AbstractOperation { */ private int threads_ = 1; + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludes(Path...) + * @since 1.2.0 + */ + public PmdOperation addExcludes(Path... excludes) { + return addExcludes(List.of(excludes)); + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes paths to exclude + * @return this operation + * @see #excludes(Collection) + * @since 1.2.0 + */ + public PmdOperation addExcludes(Collection excludes) { + excludes_.addAll(excludes); + return this; + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesFiles(Collection) + * @since 1.2.0 + */ + public PmdOperation addExcludesFiles(Collection excludes) { + return addExcludes(excludes.stream().map(File::toPath).toList()); + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesFiles(File...) + * @since 1.2.0 + */ + public PmdOperation addExcludesFiles(File... excludes) { + return addExcludesFiles(List.of(excludes)); + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesStrings(Collection) + * @since 1.2.0 + */ + public PmdOperation addExcludesStrings(Collection excludes) { + return addExcludes(excludes.stream().map(Paths::get).toList()); + } + + /** + * Adds paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesStrings(String...) + * @since 1.2.0 + */ + public PmdOperation addExcludesStrings(String... excludes) { + return addExcludesStrings(List.of(excludes)); + } + /** * Adds paths to source files, or directories containing source files to analyze.\ * @@ -322,23 +395,26 @@ public class PmdOperation extends AbstractOperation { } /** - * Adds paths to exclude from the analysis. + * Sets paths to exclude from the analysis. * * @param excludes one or more paths to exclude * @return this operation + * @see #addExcludes(Path...) */ public PmdOperation excludes(Path... excludes) { - excludes_.addAll(List.of(excludes)); + excludes(List.of(excludes)); return this; } /** - * Adds paths to exclude from the analysis. + * Sets paths to exclude from the analysis. * * @param excludes paths to exclude * @return this operation + * @see #addExcludes(Collection) */ public PmdOperation excludes(Collection excludes) { + excludes_.clear(); excludes_.addAll(excludes); return this; } @@ -348,10 +424,60 @@ public class PmdOperation extends AbstractOperation { * * @return the exclude paths */ - public List excludes() { + public Collection excludes() { return excludes_; } + /** + * Sets paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesFiles(Collection) + * @since 1.2.0 + */ + public PmdOperation excludesFiles(Collection excludes) { + excludes(excludes.stream().map(File::toPath).toList()); + return this; + } + + /** + * Sets paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesFiles(File...) + * @since 1.2.0 + */ + public PmdOperation excludesFiles(File... excludes) { + return excludesFiles(List.of(excludes)); + } + + /** + * Sets paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesStrings(Collection) + * @since 1.2.0 + */ + public PmdOperation excludesStrings(Collection excludes) { + excludes(excludes.stream().map(Paths::get).toList()); + return this; + } + + /** + * Sets paths to exclude from the analysis. + * + * @param excludes one or more paths to exclude + * @return this operation + * @see #excludesStrings(String...) + * @since 1.2.0 + */ + public PmdOperation excludesStrings(String... excludes) { + return excludesStrings(List.of(excludes)); + } + /** * Performs the PMD code analysis operation. */ @@ -519,7 +645,7 @@ public class PmdOperation extends AbstractOperation { // setExcludes if (!excludes_.isEmpty()) { - config.setExcludes(excludes_); + config.setExcludes(excludes_.stream().toList()); } // setFailOnError @@ -656,7 +782,7 @@ public class PmdOperation extends AbstractOperation { * * @param inputPath a collection of input paths * @return this operation - * @see #addInputPathsFiles(Collection) ) + * @see #addInputPathsFiles(Collection) */ public PmdOperation inputPathsFiles(Collection inputPath) { return inputPaths(inputPath.stream().map(File::toPath).toList()); diff --git a/src/test/java/rife/bld/extension/PmdOperationTest.java b/src/test/java/rife/bld/extension/PmdOperationTest.java index 48545e5..77321d6 100644 --- a/src/test/java/rife/bld/extension/PmdOperationTest.java +++ b/src/test/java/rife/bld/extension/PmdOperationTest.java @@ -47,6 +47,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; * @since 1.0 */ class PmdOperationTest { + static final String BAR = "bar"; static final String CATEGORY_FOO = "category/foo.xml"; static final Path CODE_STYLE_SAMPLE = Path.of("src/test/resources/java/CodeStyle.java"); static final String CODE_STYLE_XML = "category/java/codestyle.xml"; @@ -55,6 +56,11 @@ class PmdOperationTest { static final String DOCUMENTATION_XML = "category/java/documentation.xml"; static final Path ERROR_PRONE_SAMPLE = Path.of("src/test/resources/java/ErrorProne.java"); static final String ERROR_PRONE_XML = "category/java/errorprone.xml"; + static final File FILE_BAR = new File(BAR); + static final String FOO = "foo"; + static final File FILE_FOO = new File(FOO); + static final Path PATH_BAR = Path.of(BAR); + static final Path PATH_FOO = Path.of(FOO); static final String PERFORMANCE_XML = "category/java/performance.xml"; static final String SECURITY_XML = "category/java/security.xml"; static final String TEST = "test"; @@ -67,6 +73,39 @@ class PmdOperationTest { .reportFile(Paths.get("build", COMMAND_NAME, "pmd-test-report.txt")); } + @Test + void testAddExcludes() { + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).addExcludes(PATH_FOO); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(PATH_FOO); + + pmd = pmd.addExcludes(PATH_BAR); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(PATH_FOO, PATH_BAR); + } + + @Test + void testAddExcludesFiles() { + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).addExcludesFiles(FILE_FOO); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(FILE_FOO.toPath()); + + pmd = pmd.addExcludesFiles(FILE_BAR); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(FILE_FOO.toPath(), FILE_BAR.toPath()); + } + + @Test + void testAddExcludesStrings() { + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).addExcludesStrings(FOO); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(PATH_FOO); + + pmd = pmd.addExcludesStrings(BAR); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(PATH_FOO, PATH_BAR); + } + @Test void testAddInputPaths() throws ExitStatusException { var project = new BaseProject(); @@ -168,20 +207,55 @@ class PmdOperationTest { @Test void testExcludes() { - var foo = Path.of("foo/bar"); - var bar = Path.of("bar/foo"); var foz = Path.of("foz/baz"); var baz = Path.of("baz/foz"); - var excludes = List.of(foo, bar); - var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludes(excludes); + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludes(PATH_FOO, PATH_BAR); var config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getExcludes()).containsExactly(excludes.toArray(new Path[0])); + assertThat(pmd.excludes()).containsExactly(List.of(PATH_FOO, PATH_BAR).toArray(new Path[0])); + assertThat(config.getExcludes()).containsExactly(List.of(PATH_FOO, PATH_BAR).toArray(new Path[0])); - pmd = pmd.excludes(baz, foz); - assertThat(pmd.excludes()).hasSize(4); - config = pmd.initConfiguration(COMMAND_NAME); - assertThat(config.getExcludes()).hasSize(4).contains(bar, foz); + var excludes = List.of(List.of(PATH_FOO, PATH_BAR), List.of(foz, baz)); + for (var exclude : excludes) { + pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludes(exclude); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(exclude.toArray(new Path[0])); + } + } + + @Test + void testExcludesFiles() { + var foz = new File("foz"); + var baz = new File("baz"); + + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludesFiles(FILE_FOO, FILE_BAR); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(FILE_FOO.toPath(), FILE_BAR.toPath()); + + var excludes = List.of(List.of(FILE_FOO, FILE_BAR), List.of(foz, baz)); + for (var exclude : excludes) { + pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludesFiles(exclude); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(exclude.stream().map(File::toPath).toArray(Path[]::new)); + } + } + + @Test + void testExcludesStrings() { + var foz = "foz"; + var baz = "baz"; + + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludesStrings(FOO, BAR); + var config = pmd.initConfiguration(COMMAND_NAME); + assertThat(pmd.excludes()).containsExactly(PATH_FOO, PATH_BAR); + assertThat(config.getExcludes()).containsExactly(PATH_FOO, PATH_BAR); + + var excludes = List.of(List.of(FOO, BAR), List.of(foz, baz)); + for (var exclude : excludes) { + pmd = newPmdOperation().ruleSets(CATEGORY_FOO).excludesStrings(exclude); + config = pmd.initConfiguration(COMMAND_NAME); + assertThat(config.getExcludes()).containsExactly(exclude.stream().map(Paths::get).toArray(Path[]::new)); + } } @Test @@ -388,8 +462,8 @@ class PmdOperationTest { @Test void testPrependAuxClasspath() { - var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).prependAuxClasspath("foo", "bar"); - assertThat(pmd.prependAuxClasspath()).isEqualTo("foo" + File.pathSeparator + "bar"); + var pmd = newPmdOperation().ruleSets(CATEGORY_FOO).prependAuxClasspath(FOO, BAR); + assertThat(pmd.prependAuxClasspath()).isEqualTo(FOO + File.pathSeparator + BAR); } @Test @@ -400,27 +474,26 @@ class PmdOperationTest { @Test void testRelativizeRoots() { - var foo = Path.of("foo/bar"); - var bar = Path.of("bar/foo"); var baz = Path.of("baz/foz"); - var pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)).relativizeRoots(foo).relativizeRoots(bar.toFile()) - .relativizeRoots(baz.toString()).relativizeRoots(List.of(foo, bar, baz)); + var pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)).relativizeRoots(PATH_FOO). + relativizeRoots(PATH_BAR.toFile()).relativizeRoots(baz.toString()) + .relativizeRoots(List.of(PATH_FOO, PATH_BAR, baz)); var config = pmd.initConfiguration(COMMAND_NAME); assertThat(config.getRelativizeRoots()).isEqualTo(pmd.relativizeRoots()) - .containsExactly(foo, bar, baz, foo, bar, baz); + .containsExactly(PATH_FOO, PATH_BAR, baz, PATH_FOO, PATH_BAR, baz); pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) - .relativizeRootsFiles(List.of(foo.toFile(), bar.toFile(), baz.toFile())); + .relativizeRootsFiles(List.of(PATH_FOO.toFile(), PATH_BAR.toFile(), baz.toFile())); config = pmd.initConfiguration(COMMAND_NAME); assertThat(config.getRelativizeRoots()).as("List(File...)").isEqualTo(pmd.relativizeRoots()) - .containsExactly(foo, bar, baz); + .containsExactly(PATH_FOO, PATH_BAR, baz); pmd = newPmdOperation().ruleSets(List.of(CATEGORY_FOO)) - .relativizeRootsStrings(List.of(foo.toString(), bar.toString(), baz.toString())); + .relativizeRootsStrings(List.of(PATH_FOO.toString(), PATH_BAR.toString(), baz.toString())); config = pmd.initConfiguration(COMMAND_NAME); assertThat(config.getRelativizeRoots()).as("List(String....)").isEqualTo(pmd.relativizeRoots()) - .containsExactly(foo, bar, baz); + .containsExactly(PATH_FOO, PATH_BAR, baz); } @Test From dca8baf3adc84b3e097f7e678129425ba7316380 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 1 Feb 2025 12:56:22 -0800 Subject: [PATCH 38/52] Version 1.2.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 616d5d5..f1f3f3c 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 1, 11); + version = version(1, 2, 0); javaRelease = 17; From a2d37055c6f3b6321dd6b41cf4705df7d0a09524 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Feb 2025 23:24:32 -0800 Subject: [PATCH 39/52] Bump JUnit to version 5.12.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index f1f3f3c..d5d6186 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -47,8 +47,8 @@ public class PmdOperationBuild extends Project { scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From e28496ca161d8c965613a58ca6f38cfabb8af826 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Feb 2025 23:24:45 -0800 Subject: [PATCH 40/52] Bump bld to version 2.2.1 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/PmdOperationBuild.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 553c281..153a060 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index a3f4fd0..ba429d0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.2.0.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 0bdcd9e..8c5f2ed 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pmd/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pmd) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index ed94afd16519c4e36ee7021c1d0bf621cbef8bb2..58e97611fd7803dded57c1ef01a3cab0625855d3 100644 GIT binary patch delta 187 zcmaFymhr_~M&1B#W)=|!4h{|m_016zdFz;g)W$wj8xTFY*Isk;dz;xzAkOAq`)&wB z+KF8cETUR)o)OIWUT6rGnyg)-sK~+);LXk<_eVm3oq>UY6^H}88JR>F;I>T8EpY}L ozq!N{O#d$l0n=fn5PEH?E13VaG!7zO=Fb6iK@`Z$$!p830egZxApigX delta 187 zcmaFymhr_~M&1B#W)=|!4h{~6zZ115^42i}sf~T6HXwR(uf68x_cpVcK%C9J_T3PM zv=h4?SVXnpJR_L#z0eRWHCekvQIUZmz?+?;A60|21SMSTDO diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index b2bcd09..4745e94 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,4 +2,4 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -bld.version=2.2.0 +bld.version=2.2.1 diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index d5d6186..a09e641 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -42,7 +42,7 @@ public class PmdOperationBuild extends Project { var pmd = version(7, 10, 0); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))) + .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); From fb0acda205aa948d0d42954ac0e76cf5b48afd4c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 25 Feb 2025 11:26:15 -0800 Subject: [PATCH 41/52] Bump SLF4J to version 2.0.17 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index a09e641..6c0152a 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -45,7 +45,7 @@ public class PmdOperationBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); scope(runtime) - .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 16))); + .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 17))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) From cfbeeeb5c7ac5bb183a3d26f966857076f6c5a50 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Feb 2025 11:04:50 -0800 Subject: [PATCH 42/52] Bump PMD to version 7.11.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 6c0152a..cfcb385 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 10, 0); + var pmd = version(7, 11, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 67ce6546fe0c5dfb1e4f8c5b51c40e63078cefee Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Feb 2025 11:08:20 -0800 Subject: [PATCH 43/52] Version 1.2.1 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index cfcb385..34a3232 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 2, 0); + version = version(1, 2, 1); javaRelease = 17; From 91c9556bd95e939d6f9ec5d58aa788954d375222 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 12:29:21 -0700 Subject: [PATCH 44/52] Add generic installation instruction --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c5f2ed..dbf968f 100755 --- a/README.md +++ b/README.md @@ -7,9 +7,17 @@ [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pmd/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pmd) [![GitHub CI](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pmd/actions/workflows/bld.yml) -To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). +To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file: -To check all source code using the [Java Quickstart](https://docs.pmd-code.org/latest/pmd_rules_java.html) configuration, add the following to your build file: +```properties +bld.extension-pmd=com.uwyn.rife2:bld-pmd +``` + +For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation. + +## Check Source with PMD + +To check all source Codecode using the [Java Quickstart](https://docs.pmd-code.org/latest/pmd_rules_java.html) configuration, add the following to your build file: ```java @BuildCommand(summary = "Checks source code with PMD") From 4feba23b90c7062a61cde4c203e0aa84f3ec2e62 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 23:39:47 -0700 Subject: [PATCH 45/52] Bump JUnit to version 5.12.1 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 34a3232..87e92f6 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 2, 1); + version = version(1, 2, 2, "SNAPSHOT"); javaRelease = 17; @@ -47,8 +47,8 @@ public class PmdOperationBuild extends Project { scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 17))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From 355cdf770a73b572f27d67f02776be9fd9c27a5f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 23:39:56 -0700 Subject: [PATCH 46/52] JDK 24 --- .github/workflows/bld.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index f7e10f8..138f5e5 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - java-version: [17, 21, 23] + java-version: [17, 21, 24] steps: - name: Checkout source repository From d304b931f9c5a8a598f5e255d43b25a19bb202f1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 25 Mar 2025 12:28:54 -0700 Subject: [PATCH 47/52] Add OS matrix for Ubuntu, Windows and macOS --- .github/workflows/bld.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 138f5e5..947f3c4 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,14 +1,16 @@ name: bld-ci -on: [push, pull_request, workflow_dispatch] +on: [ push, pull_request, workflow_dispatch ] jobs: build-bld-project: - runs-on: ubuntu-latest - strategy: matrix: - java-version: [17, 21, 24] + java-version: [ 17, 21, 24 ] + kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ] + os: [ ubuntu-latest, windows-latest, macos-latest ] + + runs-on: ${{ matrix.os }} steps: - name: Checkout source repository @@ -26,4 +28,4 @@ jobs: run: ./bld download - name: Run tests - run: ./bld compile test + run: ./bld compile test \ No newline at end of file From 7ae16506774602505c5c8f792e0048b7bf183c12 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Mar 2025 05:05:57 -0700 Subject: [PATCH 48/52] Bump PMD from 7.11.0 to 7.12.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 87e92f6..6f2d8a9 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 11, 0); + var pmd = version(7, 12, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From a15218eb1db7ecdcb011eefdc05dcf626ffa6cc5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Mar 2025 05:14:21 -0700 Subject: [PATCH 49/52] Version 1.2.2 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 6f2d8a9..608abbf 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 2, 2, "SNAPSHOT"); + version = version(1, 2, 2); javaRelease = 17; From 9e8f6c049772118a8303f14d5a1b0000b0bb4e37 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 12 Apr 2025 20:58:01 -0700 Subject: [PATCH 50/52] Bump JUnit to version 5.12.2 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 608abbf..00f5097 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -47,8 +47,8 @@ public class PmdOperationBuild extends Project { scope(runtime) .include(dependency("org.slf4j", "slf4j-simple", version(2, 0, 17))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From 86ea747ba2e57d3c4de567857eb42ad5cd2912e2 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Apr 2025 08:02:04 -0700 Subject: [PATCH 51/52] Bump PMD to version 7.13.0 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 00f5097..867cd32 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -40,7 +40,7 @@ public class PmdOperationBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); - var pmd = version(7, 12, 0); + var pmd = version(7, 13, 0); scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))) .include(dependency("net.sourceforge.pmd", "pmd-java", pmd)); From 9ea433edce81d9bc653dbebf163cdca6ed931bb5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 25 Apr 2025 08:06:30 -0700 Subject: [PATCH 52/52] Version 1.2.3 --- src/bld/java/rife/bld/extension/PmdOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/PmdOperationBuild.java b/src/bld/java/rife/bld/extension/PmdOperationBuild.java index 867cd32..cbaa6ba 100644 --- a/src/bld/java/rife/bld/extension/PmdOperationBuild.java +++ b/src/bld/java/rife/bld/extension/PmdOperationBuild.java @@ -31,7 +31,7 @@ public class PmdOperationBuild extends Project { public PmdOperationBuild() { pkg = "rife.bld.extension"; name = "bld-pmd"; - version = version(1, 2, 2); + version = version(1, 2, 3); javaRelease = 17;