diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index f7e10f8..c5434f3 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -1,6 +1,6 @@
name: bld-ci
-on: [push, pull_request, workflow_dispatch]
+on: [ push, pull_request, workflow_dispatch ]
jobs:
build-bld-project:
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
- java-version: [17, 21, 23]
+ java-version: [ 17, 21, 22 ]
steps:
- name: Checkout source repository
diff --git a/config/pmd.xml b/config/pmd.xml
index 2641880..3d3203c 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 196e2c9..5d0bba4 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.7
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5
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/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
index 8c66806..aee5a33 100644
--- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java
@@ -46,8 +46,8 @@ public class TestNgOperationBuild extends Project {
scope(test)
.include(dependency("org.testng", "testng", version(7, 10, 2)))
- .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.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()
@@ -59,26 +59,28 @@ public class TestNgOperationBuild extends Project {
publishOperation()
.repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
- .repository(repository("github"))
.info()
.groupId("com.uwyn.rife2")
.artifactId("bld-testng")
.description("bld Extension to execute tests with TestNG")
.url("https://github.com/rife2/bld-testng")
- .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-testng.git")
- .developerConnection("scm:git:git@github.com:rife2/bld-testng.git")
- .url("https://github.com/rife2/bld-testng")
+ .scm(
+ new PublishScm()
+ .connection("scm:git:https://github.com/rife2/bld-testng.git")
+ .developerConnection("scm:git:git@github.com:rife2/bld-testng.git")
+ .url("https://github.com/rife2/bld-testng")
)
.signKey(property("sign.key"))
.signPassphrase(property("sign.passphrase"));
diff --git a/src/test/java/rife/bld/extension/TestNgOperationTest.java b/src/test/java/rife/bld/extension/TestNgOperationTest.java
index 8379442..b6e97b7 100644
--- a/src/test/java/rife/bld/extension/TestNgOperationTest.java
+++ b/src/test/java/rife/bld/extension/TestNgOperationTest.java
@@ -16,7 +16,6 @@
package rife.bld.extension;
-import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.Test;
import rife.bld.Project;
import rife.bld.blueprints.BaseProjectBlueprint;
@@ -98,17 +97,15 @@ class TestNgOperationTest {
.xmlPathInJar("jarPath")
.executeConstructProcessCommandList();
- try (var softly = new AutoCloseableSoftAssertions()) {
- for (var p : args) {
- var found = false;
- for (var a : params) {
- if (a.startsWith(p)) {
- found = true;
- break;
- }
+ for (var p : args) {
+ var found = false;
+ for (var a : params) {
+ if (a.startsWith(p)) {
+ found = true;
+ break;
}
- softly.assertThat(found).as(p + " not found.").isTrue();
}
+ assertThat(found).as(p + " not found.").isTrue();
}
}