From 69cf0da32a5a2f55a02a33e5ece7af9ea646af68 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 22:48:11 -0800 Subject: [PATCH 1/6] Update pages action to 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 c72607ff657acea3a4ed0f50cf130f519ae2dc65 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 22:49:34 -0800 Subject: [PATCH 2/6] Bump PMD extension to 1.2.0 --- lib/bld/bld-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 9e371e3..4f5f791 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.4 -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.10 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.0 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.0 From 0133572c46716ab595c6b62aadbd3c44898b6589 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 22:55:11 -0800 Subject: [PATCH 3/6] Bump AssertJ to version 3.27.3 --- src/bld/java/rife/bld/extension/TestNgOperationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java index 359cf8b..7e745b2 100644 --- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java +++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java @@ -49,7 +49,7 @@ public class TestNgOperationBuild extends Project { .include(dependency("org.testng", "testng", version(7, 10, 2))) .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 8e2a2fa2fdc0c9867c51e91cf34e204590f4cd0d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 22:57:38 -0800 Subject: [PATCH 4/6] Fix copyright template --- .idea/copyright/Apache_License.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/copyright/Apache_License.xml b/.idea/copyright/Apache_License.xml index ade80da..4446c15 100644 --- a/.idea/copyright/Apache_License.xml +++ b/.idea/copyright/Apache_License.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file From f12eb82f99a5c315d2043f8bd07384f9d0ef4ffa Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 22:58:44 -0800 Subject: [PATCH 5/6] Bump TestNG to 7.11.0 --- README.md | 2 +- examples/src/bld/java/com/example/ExamplesBuild.java | 2 +- src/bld/java/rife/bld/extension/TestNgOperationBuild.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 17eba71..be61ab7 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,5 @@ Don't forget to add a TestNG `test` dependency to your build file, as it is not ```java repositories = List.of(MAVEN_CENTRAL); -scope(test).include(dependency("org.testng", "testng", version(7, 10, 2))); +scope(test).include(dependency("org.testng", "testng", version(7, 11, 0))); ``` diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index 6827d0e..f73038a 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -36,7 +36,7 @@ public class ExamplesBuild extends BaseProject { repositories = List.of(MAVEN_CENTRAL); - scope(test).include(dependency("org.testng", "testng", version(7, 10, 2))); + scope(test).include(dependency("org.testng", "testng", version(7, 11, 0))); } public static void main(String[] args) { diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java index 7e745b2..fc4dac5 100644 --- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java +++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java @@ -46,7 +46,7 @@ public class TestNgOperationBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))); scope(test) - .include(dependency("org.testng", "testng", version(7, 10, 2))) + .include(dependency("org.testng", "testng", version(7, 11, 0))) .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, 3))); From 4a0ad1aebe3889dbe0ea8bb73118516bd3878eda Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 12 Feb 2025 23:00:19 -0800 Subject: [PATCH 6/6] Version 1.0.2 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/TestNgOperationBuild.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 71441b2..1421422 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -2,7 +2,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.9 -bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.1 +bld.extension-testng=com.uwyn.rife2:bld-testng:1.0.2 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.0 diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java index fc4dac5..8097262 100644 --- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java +++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java @@ -33,7 +33,7 @@ public class TestNgOperationBuild extends Project { public TestNgOperationBuild() { pkg = "rife.bld.extension"; name = "bld-testng"; - version = version(1, 0, 1); + version = version(1, 0, 2); javaRelease = 17;