From 660a4ea8407a986747dcab6821afc823e12df46c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 26 Oct 2024 05:30:06 -0700 Subject: [PATCH 1/4] Updated dependencies Bumped JUnit 5 to version 5.11.3 Bumped PMD extension to version 1.1.7 Bumped JDK to version 23 (GitHub CI Workflow) --- .github/workflows/bld.yml | 2 +- config/pmd.xml | 4 ++-- lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) 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 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/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index a283f1b..196e2c9 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.3 -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.6 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.7 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 diff --git a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java index e3a9e06..b458d6b 100644 --- a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java @@ -48,6 +48,8 @@ public class CheckstyleOperationBuild extends Project { .include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 18, 2))) .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 2fd73691c26113811d76175d719c4f6d6965b7e3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 26 Oct 2024 05:31:38 -0700 Subject: [PATCH 2/4] Bumped CheckStyle to version 10.19.0 --- README.md | 2 +- examples/src/bld/java/com/example/ExamplesBuild.java | 2 +- src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index cac59a4..645b2c1 100644 --- a/README.md +++ b/README.md @@ -37,5 +37,5 @@ not provided by the extension. For example: ```java repositories = List.of(MAVEN_CENTRAL); -scope(test).include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 18, 2))); +scope(test).include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 19, 0))); ``` diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index df0f79a..f8fee6b 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -23,7 +23,7 @@ public class ExamplesBuild extends BaseProject { repositories = List.of(MAVEN_CENTRAL); - scope(test).include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 18, 2))); + scope(test).include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 19, 0))); testOperation().mainClass("com.example.ExamplesTest"); } diff --git a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java index b458d6b..035d61a 100644 --- a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java @@ -45,9 +45,7 @@ public class CheckstyleOperationBuild extends Project { scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0))); scope(test) - .include(dependency("com.puppycrawl.tools", "checkstyle", version(10, 18, 2))) - .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("com.puppycrawl.tools", "checkstyle", version(10, 19, 0))) .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))); From 11476127f0cb333b2677a7b60e70a71fb3b89a1e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 26 Oct 2024 05:32:17 -0700 Subject: [PATCH 3/4] Minor cleanups --- src/main/java/rife/bld/extension/checkstyle/OutputFormat.java | 3 +++ src/test/java/rife/bld/extension/CheckstyleOperationTest.java | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/rife/bld/extension/checkstyle/OutputFormat.java b/src/main/java/rife/bld/extension/checkstyle/OutputFormat.java index c37a585..6ff411b 100644 --- a/src/main/java/rife/bld/extension/checkstyle/OutputFormat.java +++ b/src/main/java/rife/bld/extension/checkstyle/OutputFormat.java @@ -26,6 +26,9 @@ public enum OutputFormat { public final String label; + /** + * Sets the label of this output format. + */ OutputFormat(String label) { this.label = label; } diff --git a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java index 53ff576..e532cdf 100644 --- a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java +++ b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java @@ -38,7 +38,6 @@ import java.util.logging.Logger; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; - class CheckstyleOperationTest { public static final String SRC_MAIN_JAVA = "src/main/java"; public static final String SRC_TEST_JAVA = "src/test/java"; From 51fa6fbab24ba76ee0e7b362745f89d95a31f8dd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 26 Oct 2024 05:32:46 -0700 Subject: [PATCH 4/4] Version 1.0.6 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index d673d49..1a304ce 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-checkstyle=com.uwyn.rife2:bld-checkstyle:1.0.5 +bld.extension-checkstyle=com.uwyn.rife2:bld-checkstyle:1.0.6 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 diff --git a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java index 035d61a..2b0c0c5 100644 --- a/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java +++ b/src/bld/java/rife/bld/extension/CheckstyleOperationBuild.java @@ -33,7 +33,7 @@ public class CheckstyleOperationBuild extends Project { public CheckstyleOperationBuild() { pkg = "rife.bld.extension"; name = "CheckstyleOperation"; - version = version(1, 0, 5); + version = version(1, 0, 6); javaRelease = 17;