diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index 35cefd7..7d224f6 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -11,8 +11,8 @@ jobs:
strategy:
matrix:
- java-version: [17, 21, 23]
- kotlin-version: [1.9.24, 2.0.21]
+ java-version: [17, 21, 22]
+ kotlin-version: [ 1.19.24, 2.0.0 ]
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/examples/src/bld/java/com/example/SampleBuild.java b/examples/src/bld/java/com/example/SampleBuild.java
index ba5786e..f450b0c 100644
--- a/examples/src/bld/java/com/example/SampleBuild.java
+++ b/examples/src/bld/java/com/example/SampleBuild.java
@@ -27,8 +27,8 @@ public class SampleBuild extends Project {
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
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.junit.jupiter", "junit-jupiter", version(5, 11, 0)))
+ .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 0)));
}
public static void main(String[] args) {
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index f148e62..c3b3e47 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
-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.version=2.1.0
diff --git a/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java b/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java
index e23aa11..9f5158e 100644
--- a/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/GeneratedVersionOperationBuild.java
@@ -46,8 +46,8 @@ public class GeneratedVersionOperationBuild extends Project {
scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(2, 1, 0)));
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.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)));
precompileOperation()
@@ -63,26 +63,28 @@ public class GeneratedVersionOperationBuild extends Project {
publishOperation()
.repositories(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2"))
- .repository(repository("github"))
.info()
.groupId("com.uwyn.rife2")
.artifactId("bld-generated-version")
.description("bld Extension to Generate Project Version Data")
.url("https://github.com/rife2/generated-version")
- .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/generated-version.git")
- .developerConnection("scm:git:git@github.com:rife2/generated-version.git")
- .url("https://github.com/rife2/generated-version")
+ .scm(
+ new PublishScm()
+ .connection("scm:git:https://github.com/rife2/generated-version.git")
+ .developerConnection("scm:git:git@github.com:rife2/generated-version.git")
+ .url("https://github.com/rife2/generated-version")
)
.signKey(property("sign.key"))
.signPassphrase(property("sign.passphrase"));
diff --git a/src/test/java/rife/bld/extension/GeneratedVersionTest.java b/src/test/java/rife/bld/extension/GeneratedVersionTest.java
index 68da1e3..d4334ff 100644
--- a/src/test/java/rife/bld/extension/GeneratedVersionTest.java
+++ b/src/test/java/rife/bld/extension/GeneratedVersionTest.java
@@ -16,7 +16,6 @@
package rife.bld.extension;
-import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import rife.bld.BaseProject;
@@ -117,11 +116,9 @@ class GeneratedVersionTest {
var t = gv.buildTemplate();
assertThat(t).isNotNull();
- try (var softly = new AutoCloseableSoftAssertions()) {
- softly.assertThat(gv.getProject()).isEqualTo(PROJECT);
- softly.assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg());
- softly.assertThat(gv.getProjectName()).isEqualTo(PROJECT.name());
- }
+ assertThat(gv.getProject()).isEqualTo(PROJECT);
+ assertThat(gv.getPackageName()).isEqualTo(PROJECT.pkg());
+ assertThat(gv.getProjectName()).isEqualTo(PROJECT.name());
assertThat(t.getContent()).contains("package com.example;").contains("class GeneratedVersion")
.contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1")
@@ -204,15 +201,13 @@ class GeneratedVersionTest {
gv.setDirectory(new File("build"));
gv.setExtension(".java");
- try (var softly = new AutoCloseableSoftAssertions()) {
- softly.assertThat(gv.getProject()).as("project").isEqualTo(PROJECT);
- softly.assertThat(gv.getTemplate()).as("template").exists();
- softly.assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool");
- softly.assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App");
- softly.assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion");
- softly.assertThat(gv.getExtension()).as("extension").isEqualTo(".java");
- softly.assertThat(gv.getDirectory()).as("directory").isDirectory();
- }
+ assertThat(gv.getProject()).as("project").isEqualTo(PROJECT);
+ assertThat(gv.getTemplate()).as("template").exists();
+ assertThat(gv.getPackageName()).as("package name").isEqualTo("com.example.cool");
+ assertThat(gv.getProjectName()).as("project name").isEqualTo("Cool App");
+ assertThat(gv.getClassName()).as("class name").isEqualTo("CoolVersion");
+ assertThat(gv.getExtension()).as("extension").isEqualTo(".java");
+ assertThat(gv.getDirectory()).as("directory").isDirectory();
}
@Test