From a986add8ee7c8e0077f59d6a5c263472b958dd8f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sun, 29 Sep 2024 04:26:17 -0700 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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;