From d98a140f9669016196105419ac0a0ba47a145282 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 19 Sep 2024 10:39:54 -0700 Subject: [PATCH 01/44] Bumped Spring Boot to version 3.3.4 --- README.md | 2 +- examples/.vscode/settings.json | 3 +- .../example/demo/DemoApplicationBuild.java | 10 +++--- .../rife/bld/extension/SpringBootBuild.java | 30 ++++++++-------- .../bld/extension/BootJarOperationTest.java | 36 ++++++++++--------- 5 files changed, 42 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 1646bc3..eb04250 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.3")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.4")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index 4c33beb..8f4e3d2 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -11,5 +11,6 @@ "java.project.referencedLibraries": [ "${HOME}/.bld/dist/bld-2.1.0.jar", "lib/**/*.jar" - ] + ], + "java.compile.nullAnalysis.mode": "automatic" } diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 8d3feab..551b5ec 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -27,15 +27,15 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.3.3")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.3")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.3")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.3.4")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.4")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.4")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.3")) + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.4")) .include(dependency("org.junit.jupiter:junit-jupiter:5.11.0")) .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.0")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.3.3")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.3.4")); } public static void main(String[] args) { diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 8d7672e..d96d2a3 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 8); + version = version(0, 9, 9, "SNAPSHOT"); javaRelease = 17; @@ -57,28 +57,26 @@ public class SpringBootBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) + .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId("bld-spring-boot") .description("bld Extension for Spring Boot") .url("https://github.com/rife2/bld-spring-boot") - .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-spring-boot.git") - .developerConnection("scm:git:git@github.com:rife2/bld-spring-boot.git") - .url("https://github.com/rife2/bld-spring-boot") + .scm(new PublishScm() + .connection("scm:git:https://github.com/rife2/bld-spring-boot.git") + .developerConnection("scm:git:git@github.com:rife2/bld-spring-boot.git") + .url("https://github.com/rife2/bld-spring-boot") ) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 716f250..1b10a4a 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -16,6 +16,7 @@ package rife.bld.extension; +import org.assertj.core.api.AutoCloseableSoftAssertions; import org.junit.jupiter.api.Test; import rife.bld.Project; import rife.bld.dependencies.VersionNumber; @@ -35,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.1.0.jar"; - private static final String BOOT_VERSION = "3.3.3"; + private static final String BOOT_VERSION = "3.3.4"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; @@ -345,21 +346,24 @@ class BootJarOperationTest { var project = new CustomProject(tmp_dir); var bootJar = new BootJarOperation().fromProject(project).sourceDirectories(SRC_MAIN_JAVA); - assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS); - assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3) - .containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(), - new File(SRC_MAIN_JAVA)); - assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3); - assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version").isEqualTo("1.0"); - assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher"); - assertThat(bootJar.manifestAttributes().get("Start-Class")).as("Start-Class").isEqualTo(MAIN_CLASS); - assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst") - .manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst"); - assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory(); - assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory()); - assertThat(bootJar.infLibs()).as("infoLibs").isEmpty(); - assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty(); - assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar"); + try (var softly = new AutoCloseableSoftAssertions()) { + softly.assertThat(bootJar.mainClass()).as("mainClass").isEqualTo(MAIN_CLASS); + softly.assertThat(bootJar.sourceDirectories()).as("sourceDirectories.size").hasSize(3) + .containsExactly(project.buildMainDirectory(), project.srcMainResourcesDirectory(), + new File(SRC_MAIN_JAVA)); + softly.assertThat(bootJar.manifestAttributes()).as("manifestAttributes.size").hasSize(3); + softly.assertThat(bootJar.manifestAttributes().get("Manifest-Version")).as("Manifest-Version") + .isEqualTo("1.0"); + softly.assertThat(bootJar.manifestAttributes().get("Main-Class")).as("Main-Class").endsWith("JarLauncher"); + softly.assertThat(bootJar.manifestAttributes().get("Start-Class")).as("Start-Class").isEqualTo(MAIN_CLASS); + softly.assertThat(bootJar.manifestAttribute("Manifest-Test", "tsst") + .manifestAttributes().get("Manifest-Test")).as("Manifest-Test").isEqualTo("tsst"); + softly.assertThat(bootJar.destinationDirectory()).as("destinationDirectory").isDirectory(); + softly.assertThat(bootJar.destinationDirectory()).isEqualTo(project.buildDistDirectory()); + softly.assertThat(bootJar.infLibs()).as("infoLibs").isEmpty(); + softly.assertThat(bootJar.launcherLibs()).as("launcherJars").isEmpty(); + softly.assertThat(bootJar.destinationFileName()).isEqualTo("test_project-0.0.1-boot.jar"); + } FileUtils.deleteDirectory(tmp_dir); } From e711e405aacb5477dbdd8cf57ae09e48b6235bcc Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 24 Oct 2024 11:17:51 -0700 Subject: [PATCH 02/44] Updated dependencies Bumped Spring Boot to version 5.3.4 Bumped PMD extension to version 1.1.6 Bumped JUnit to version 5.11.3 Bumped JDK to version 23 (GitHub CI) --- .github/workflows/bld.yml | 2 +- README.md | 2 +- .../com/example/demo/DemoApplicationBuild.java | 14 +++++++------- lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/SpringBootBuild.java | 4 ++-- .../rife/bld/extension/BootJarOperationTest.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 2d50ee7..6020ea2 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/README.md b/README.md index eb04250..31ec0cd 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.4")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.5")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 551b5ec..fbeed8c 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -27,15 +27,15 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.3.4")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.4")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.4")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.3.5")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.5")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.5")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.4")) - .include(dependency("org.junit.jupiter:junit-jupiter:5.11.0")) - .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.0")); + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.5")) + .include(dependency("org.junit.jupiter:junit-jupiter:5.11.3")) + .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.3")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.3.4")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.3.5")); } public static void main(String[] args) { diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index e0ee3fb..942be0f 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.5 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.6 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index d96d2a3..fea3c51 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -45,8 +45,8 @@ public class SpringBootBuild 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, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 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))); javadocOperation() diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 1b10a4a..d3f6628 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.1.0.jar"; - private static final String BOOT_VERSION = "3.3.4"; + private static final String BOOT_VERSION = "3.3.5"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From 7ad2b23b2e967b0c1adfdeb2f3469008fcb589c6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 28 Oct 2024 10:12:04 -0700 Subject: [PATCH 03/44] Bumped PMD extensions to version 1.1.7 --- config/pmd.xml | 4 ++-- lib/bld/bld-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/pmd.xml b/config/pmd.xml index 39909f7..991e16e 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 942be0f..cff8e83 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -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_RELEASES bld.sourceDirectories= bld.version=2.1.0 From c208b68226f226b948149c33a39064156d8c49b4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Nov 2024 05:39:56 -0800 Subject: [PATCH 04/44] Bumped Spring Boot to version 3.3.6 --- README.md | 2 +- .../java/com/example/demo/DemoApplicationBuild.java | 10 +++++----- .../java/rife/bld/extension/BootJarOperationTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 31ec0cd..f6cd67f 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.5")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.6")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index fbeed8c..9242a0f 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -27,15 +27,15 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.3.5")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.5")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.5")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.3.6")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.6")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.6")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.5")) + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.6")) .include(dependency("org.junit.jupiter:junit-jupiter:5.11.3")) .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.3")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.3.5")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.3.6")); } public static void main(String[] args) { diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index d3f6628..9ab9ee1 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.1.0.jar"; - private static final String BOOT_VERSION = "3.3.5"; + private static final String BOOT_VERSION = "3.3.6"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From c3562c327563c27df11bc0453d4318482cd80f7e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Nov 2024 05:40:08 -0800 Subject: [PATCH 05/44] Version 0.9.9 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.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 22a8a28..159b057 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-boot=com.uwyn.rife2:bld-spring-boot:0.9.8 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:0.9.9 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/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index fea3c51..22c0fec 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 9, "SNAPSHOT"); + version = version(0, 9, 9); javaRelease = 17; From 25c0a63ee6f668748e2c8374ed0d9864a7563ec3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Nov 2024 12:41:42 -0800 Subject: [PATCH 06/44] Bumped Spring Boot to verson 3.4.0 --- README.md | 2 +- .../java/com/example/demo/DemoApplicationBuild.java | 10 +++++----- .../java/rife/bld/extension/BootJarOperationTest.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f6cd67f..516e70d 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.3.6")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.4.0")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 9242a0f..0a00934 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -27,15 +27,15 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.3.6")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.3.6")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.3.6")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.4.0")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.4.0")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.4.0")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.3.6")) + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.4.0")) .include(dependency("org.junit.jupiter:junit-jupiter:5.11.3")) .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.3")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.3.6")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.4.0")); } public static void main(String[] args) { diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 9ab9ee1..2d13b86 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.1.0.jar"; - private static final String BOOT_VERSION = "3.3.6"; + private static final String BOOT_VERSION = "3.4.0"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From cf558ef3572dcecfe688f2b2f9b2d167ab92eb88 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Nov 2024 12:41:58 -0800 Subject: [PATCH 07/44] Version 1.0.0 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.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 159b057..4e15239 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-boot=com.uwyn.rife2:bld-spring-boot:0.9.9 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.0 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/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 22c0fec..a7bceeb 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 9); + version = version(1, 0, 0); javaRelease = 17; From 4eed926a06ff4846bdf31f7184997c66c01f9f37 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 19 Dec 2024 07:52:56 -0800 Subject: [PATCH 08/44] Updated dependencies Bumped Spring Boot to version 3.4.1 Bumped PMD extension to version 1.1.7 Bumped JUnit to version 5.11.4 --- README.md | 2 +- .../com/example/demo/DemoApplicationBuild.java | 14 +++++++------- lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/SpringBootBuild.java | 4 ++-- .../rife/bld/extension/BootJarOperationTest.java | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 516e70d..e72ae2e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.4.0")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.4.1")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 0a00934..5169171 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -27,15 +27,15 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.4.0")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.4.0")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.4.0")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.4.1")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.4.1")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.4.1")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.4.0")) - .include(dependency("org.junit.jupiter:junit-jupiter:5.11.3")) - .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.3")); + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.4.1")) + .include(dependency("org.junit.jupiter:junit-jupiter:5.11.4")) + .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.4")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.4.0")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.4.1")); } public static void main(String[] args) { diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index cff8e83..d36c6fe 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ 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.8 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index a7bceeb..57ca208 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -45,8 +45,8 @@ public class SpringBootBuild 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, 4))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) .include(dependency("org.assertj", "assertj-core", version(3, 26, 3))); javadocOperation() diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 2d13b86..03598ba 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.1.0.jar"; - private static final String BOOT_VERSION = "3.4.0"; + private static final String BOOT_VERSION = "3.4.1"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; @@ -62,6 +62,7 @@ class BootJarOperationTest { org/springframework/boot/loader/jar/ZipInflaterInputStream.class org/springframework/boot/loader/jarmode/ org/springframework/boot/loader/jarmode/JarMode.class + org/springframework/boot/loader/jarmode/JarModeErrorException.class org/springframework/boot/loader/launch/ org/springframework/boot/loader/launch/Archive$Entry.class org/springframework/boot/loader/launch/Archive.class From c77118a6eb13afb53f8713d72a82f906a94bb705 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 19 Dec 2024 08:22:18 -0800 Subject: [PATCH 09/44] Minor cleanups --- .github/workflows/bld.yml | 4 ++-- .github/workflows/pages.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 6020ea2..a97b1a0 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, 23 ] steps: - name: Checkout source repository diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index e191f6d..1e9f25d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -3,7 +3,7 @@ name: javadocs-pages on: # Runs on pushes targeting the default branch push: - branches: ["main"] + branches: [ "main" ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 3f6ab7383fe3f4f88af14970696bc483237389c1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 19 Dec 2024 08:23:00 -0800 Subject: [PATCH 10/44] Version 1.0.1 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.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 4e15239..2c63af5 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-boot=com.uwyn.rife2:bld-spring-boot:1.0.0 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.1 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/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 57ca208..c725cf1 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(1, 0, 0); + version = version(1, 0, 1); javaRelease = 17; From ff9a62eccd84526fb714b81ecc41530eb7873f63 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 28 Dec 2024 18:11:20 -0800 Subject: [PATCH 11/44] Bumped PMD extension to version 1.1.9 --- 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 d36c6fe..06587e9 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.8 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.9 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 From 08c527f6e6e42dbe9c03adf9edd1d379e289dc0d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 28 Dec 2024 18:11:44 -0800 Subject: [PATCH 12/44] Bumped AssertJ to version 3.27.0 --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index c725cf1..8b70e01 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -47,7 +47,7 @@ public class SpringBootBuild extends Project { scope(test) .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, 26, 3))); + .include(dependency("org.assertj", "assertj-core", version(3, 27, 0))); javadocOperation() .javadocOptions() From c232d50d8fa7f1e71491f995d03526d6a917b0f9 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sat, 11 Jan 2025 13:46:12 -0500 Subject: [PATCH 13/44] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e72ae2e..82fc2cd 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframeworkboot:spring-boot-loader:3.4.1")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.4.1")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) From 2962797f94b2b51fed23ed025e432e3825531584 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 28 Dec 2024 18:11:44 -0800 Subject: [PATCH 14/44] Bumped PMD extension to version 1.1.10 --- 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 06587e9..aa3ead5 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.9 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.10 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.1.0 From 772bc63bb22dc7b40fa9a0beefedc0ced46c6d8c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Jan 2025 23:40:33 -0800 Subject: [PATCH 15/44] Bumped AssertJ to version 3.27.2 --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 8b70e01..3ded5ba 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -47,7 +47,7 @@ public class SpringBootBuild extends Project { scope(test) .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, 0))); + .include(dependency("org.assertj", "assertj-core", version(3, 27, 2))); javadocOperation() .javadocOptions() From 5ad38d14ec3fbeabe4c2751f21c44ea243fc95a8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Jan 2025 23:41:10 -0800 Subject: [PATCH 16/44] Bumped bld to version 2.2.0 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- examples/.idea/libraries/bld.xml | 4 ++-- examples/.vscode/settings.json | 2 +- examples/lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes examples/lib/bld/bld-wrapper.properties | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/SpringBootBuild.java | 2 +- .../bld/extension/BootJarOperationTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 969b816..522eb88 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index 4c33beb..a3f4fd0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.0.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index 82fc2cd..270b076 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.1.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-spring-boot) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-spring-boot) [![GitHub CI](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml) diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index 8105a64..63c014a 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index 8f4e3d2..6520d90 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.1.0.jar", + "${HOME}/.bld/dist/bld-2.2.0.jar", "lib/**/*.jar" ], "java.compile.nullAnalysis.mode": "automatic" diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index d768b08bf805a00f4b69f55f7e220c64225f511e..74ab86b7f6baecfc2037ede594cecffa982c6917 100644 GIT binary patch delta 203 zcmaFymhr_~M!o=VW)=|!4h{|m)=An?6ZvXcK=j6b6B{sNa-Y4%=Jz(UnZUfwefC{Y zmW&gd9z;y7;2a}_^`p=LB0E{9L{8 Date: Mon, 13 Jan 2025 23:47:48 -0800 Subject: [PATCH 17/44] Updated copyright for 2025 --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- src/main/java/rife/bld/extension/AbstractBootOperation.java | 2 +- src/main/java/rife/bld/extension/BootJarOperation.java | 2 +- src/main/java/rife/bld/extension/BootUtils.java | 2 +- src/main/java/rife/bld/extension/BootWarOperation.java | 2 +- src/test/java/rife/bld/extension/BootJarOperationTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 4617965..06289d8 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java index d6b4d2c..9a429e9 100644 --- a/src/main/java/rife/bld/extension/AbstractBootOperation.java +++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java index 22edfe9..c2ded1c 100644 --- a/src/main/java/rife/bld/extension/BootJarOperation.java +++ b/src/main/java/rife/bld/extension/BootJarOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java index c45138c..05ca2b8 100644 --- a/src/main/java/rife/bld/extension/BootUtils.java +++ b/src/main/java/rife/bld/extension/BootUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index e08ae1c..a1fe0d2 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 136cd7b..12770cb 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2024 the original author or authors. + * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 040a4681e5b55e53f93036be6641c9e528556fb6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 14 Jan 2025 12:16:08 -0800 Subject: [PATCH 18/44] Version 1.0.2 --- .idea/icon.svg | 13 +++++++++++++ examples/lib/bld/bld-wrapper.properties | 2 +- .../java/rife/bld/extension/SpringBootBuild.java | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 .idea/icon.svg diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..81220b4 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 973cc61..619072d 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-boot=com.uwyn.rife2:bld-spring-boot:1.0.1 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot: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/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 06289d8..7ac4df8 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(1, 0, 1); + version = version(1, 0, 2); javaRelease = 17; From ffb8a706d3c416287afc84773867471f50cf59d5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 23 Jan 2025 08:56:24 -0800 Subject: [PATCH 19/44] Bumped AssertJ to version 3.27.3 --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 7ac4df8..bff08a1 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -47,7 +47,7 @@ public class SpringBootBuild extends Project { scope(test) .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 f8db36b235f2372b5460d6715a75bde892521c14 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 23 Jan 2025 09:20:09 -0800 Subject: [PATCH 20/44] Bumped Spring Boot to version 3.4.2 --- .../com/example/demo/DemoApplicationBuild.java | 15 ++++++++------- .../rife/bld/extension/BootJarOperationTest.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 5169171..d46f067 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -26,16 +26,17 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); + var boot = version(3, 4, 2); scope(compile) - .include(dependency("org.springframework.boot:spring-boot-starter:3.4.1")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.4.1")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.4.1")); + .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) + .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) + .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.4.1")) - .include(dependency("org.junit.jupiter:junit-jupiter:5.11.4")) - .include(dependency("org.junit.platform:junit-platform-console-standalone:1.11.4")); + .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.4.1")); + .include(dependency("org.springframework.boot", "spring-boot-loader", boot)); } public static void main(String[] args) { diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 12770cb..e2a2bd8 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.2.0.jar"; - private static final String BOOT_VERSION = "3.4.1"; + private static final String BOOT_VERSION = "3.4.2"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From 98dbf61eb1aef71b5895ec268a1beea088857672 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 23 Jan 2025 10:12:19 -0800 Subject: [PATCH 21/44] Version 1.0.3-SNAPSHOT --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index bff08a1..b5324d9 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(1, 0, 2); + version = version(1, 0, 3, "SNAPSHOT"); javaRelease = 17; From 0d60e91f1123596e780bfb3e93a09d37d251fd13 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 23 Jan 2025 10:23:30 -0800 Subject: [PATCH 22/44] Updated deprecated artifact actions --- .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 1e9f25d..e864e62 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 6f0e912bcb56df513b3fe949e71dce156c1941c4 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Feb 2025 09:58:42 -0800 Subject: [PATCH 23/44] Bump PMD extension to version 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 df95ef5..d5cc255 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -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_RELEASES bld.sourceDirectories= bld.version=2.2.0 From 0b1fc2e3d9a25b85e753b0f936a4a7e869e0aff8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Feb 2025 09:59:08 -0800 Subject: [PATCH 24/44] Bump Spring Boot to version 3.4.3 --- README.md | 2 +- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 2 +- src/test/java/rife/bld/extension/BootJarOperationTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 270b076..bdff1c1 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.4.1")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.4.3")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index d46f067..5645744 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -26,7 +26,7 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); - var boot = version(3, 4, 2); + var boot = version(3, 4, 3); scope(compile) .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index e2a2bd8..c1d4f91 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.2.0.jar"; - private static final String BOOT_VERSION = "3.4.2"; + private static final String BOOT_VERSION = "3.4.3"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From 11ff9c0afc1538c2949599370c73f854677b3974 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Feb 2025 10:01:56 -0800 Subject: [PATCH 25/44] Updated copyright --- .idea/copyright/Apache_License.xml | 4 ++-- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- src/main/java/rife/bld/extension/AbstractBootOperation.java | 2 +- src/main/java/rife/bld/extension/BootJarOperation.java | 2 +- src/main/java/rife/bld/extension/BootUtils.java | 2 +- src/main/java/rife/bld/extension/BootWarOperation.java | 2 +- src/test/java/rife/bld/extension/BootJarOperationTest.java | 2 +- 7 files changed, 8 insertions(+), 8 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 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index b5324d9..48ced53 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/AbstractBootOperation.java b/src/main/java/rife/bld/extension/AbstractBootOperation.java index 9a429e9..753a445 100644 --- a/src/main/java/rife/bld/extension/AbstractBootOperation.java +++ b/src/main/java/rife/bld/extension/AbstractBootOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootJarOperation.java b/src/main/java/rife/bld/extension/BootJarOperation.java index c2ded1c..d758857 100644 --- a/src/main/java/rife/bld/extension/BootJarOperation.java +++ b/src/main/java/rife/bld/extension/BootJarOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootUtils.java b/src/main/java/rife/bld/extension/BootUtils.java index 05ca2b8..42ae132 100644 --- a/src/main/java/rife/bld/extension/BootUtils.java +++ b/src/main/java/rife/bld/extension/BootUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/main/java/rife/bld/extension/BootWarOperation.java b/src/main/java/rife/bld/extension/BootWarOperation.java index a1fe0d2..51f7fdf 100644 --- a/src/main/java/rife/bld/extension/BootWarOperation.java +++ b/src/main/java/rife/bld/extension/BootWarOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index c1d4f91..7feff30 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-Copyright $today.yearamp;#36;today.year the original author or authors. + * Copyright 2023-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From ffee594e3236e972fc946213b110739b42051acb Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Feb 2025 22:51:45 -0800 Subject: [PATCH 26/44] Bump JUnit to version 5.12.0 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 4 ++-- src/bld/java/rife/bld/extension/SpringBootBuild.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 5645744..0372d56 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -33,8 +33,8 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) - .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.junit.jupiter", "junit-jupiter", version(5, 12, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))); scope(standalone) .include(dependency("org.springframework.boot", "spring-boot-loader", boot)); } diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 48ced53..9107a2e 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -45,8 +45,8 @@ public class SpringBootBuild extends Project { scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))); scope(test) - .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.junit.jupiter", "junit-jupiter", version(5, 12, 0))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From f1bff720e00a9738af2aafa8855294cb9cf00045 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 24 Feb 2025 22:52:23 -0800 Subject: [PATCH 27/44] Bump bld to version 2.2.1 --- .idea/libraries/bld.xml | 4 ++-- .vscode/settings.json | 2 +- README.md | 2 +- examples/.idea/libraries/bld.xml | 4 ++-- examples/.vscode/settings.json | 2 +- examples/lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes examples/lib/bld/bld-wrapper.properties | 2 +- lib/bld/bld-wrapper.jar | Bin 30440 -> 30440 bytes lib/bld/bld-wrapper.properties | 2 +- .../rife/bld/extension/SpringBootBuild.java | 2 +- .../bld/extension/BootJarOperationTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 522eb88..074c2f6 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.vscode/settings.json b/.vscode/settings.json index a3f4fd0..ba429d0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.2.0.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index bdff1c1..4ac51b0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.2.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-spring-boot) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-spring-boot) [![GitHub CI](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml) diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index 63c014a..a203de8 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index 6520d90..ce89108 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.2.0.jar", + "${HOME}/.bld/dist/bld-2.2.1.jar", "lib/**/*.jar" ], "java.compile.nullAnalysis.mode": "automatic" diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index 74ab86b7f6baecfc2037ede594cecffa982c6917..309bffc115217c598e160e1397280356103926aa 100644 GIT binary patch delta 187 zcmaFymhr_~M&1B#W)=|!4h{|moy`#wdFz;g)W$wj8xTFY*Isk;dz;xzAkOAq`)&wB z+KF8cETUR)o)OIWUT6rGnyg)-sK~+);LXk<_eVm3oq>UY6^H}88JR>F;I>T8EpY}L ozq!N{O#d$l0n=fn5PEH?E13VaG!7zO=Fb6iK@`Z$$!p830heYxaR2}S delta 187 zcmaFymhr_~M&1B#W)=|!4h{|m)=AnEdFz;g)W$wj8xTFY*Isk;dz;xzAkOAq`)&wB z+KF8cETUR)o)OIWUT6rGnyg)-sK~$&;LXm_aYjCzoq>UY6^H}88JR>F;I>T8EpY}L ozq!N{O#d$l0n=fn5PEH?E13VaG!7zO=Fb6iK@`Z$$!p830Y0WS4FCWD diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 619072d..204e8d3 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -4,4 +4,4 @@ bld.downloadLocation= bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.2 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.2.0 +bld.version=2.2.1 diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index d40b5d693eaebe5f1d8d2ca8ef2437b1b9a2cd2f..4a27297c401c9bb6c88a9c33422e4fe46e1d4ef4 100644 GIT binary patch delta 187 zcmaFymhr_~M&1B#W)=|!4h{|m?adJrdFz;g)W$wj8xTFY*Isk;dz;xzAkOAq`)&wB z+KF8cETUR)o)OIWUT6rGnyg)-sK~+);LXk<_eVm3oq>UY6^H}88JR>F;I>T8EpY}L ozq!N{O#d$l0n=fn5PEH?E13VaG!7zO=Fb6iK@`Z$$!p830g=)?VE_OC delta 187 zcmaFymhr_~M&1B#W)=|!4h{|mmPy(ZdFz;g)W$wj8xTFY*Isk;dz;xzAkOAq`)&wB z+KF8cETUR)o)OIWUT6rGnyg)-sK~$&;LXm_aYjCzoq>UY6^H}88JR>F;I>T8EpY}L ozq!N{O#d$l0n=fn5PEH?E13VaG!7zO=Fb6iK@`Z$$!p830XY&i{Qv*} diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index d5cc255..e11d1a7 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -4,4 +4,4 @@ bld.downloadLocation= bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.0 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= -bld.version=2.2.0 +bld.version=2.2.1 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 9107a2e..ccac98c 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -43,7 +43,7 @@ public class SpringBootBuild extends Project { repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); scope(compile) - .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))); + .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 7feff30..04f6453 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { - private static final String BLD = "bld-2.2.0.jar"; + private static final String BLD = "bld-2.2.1.jar"; private static final String BOOT_VERSION = "3.4.3"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; From 5a992441585e62f92a2365e1e4fbaa96e087ad8e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 13:12:18 -0700 Subject: [PATCH 28/44] Bump PMD extension to version 1.2.1 --- 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 e11d1a7..2ff78b0 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.0 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.1 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.1 From 1a2ea9edb00454337816d5ed232457f4110cbb8f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 13:12:40 -0700 Subject: [PATCH 29/44] Bump JUnit to version 5.12.1 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 4 ++-- src/bld/java/rife/bld/extension/SpringBootBuild.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 0372d56..307b68a 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -33,8 +33,8 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))); scope(standalone) .include(dependency("org.springframework.boot", "spring-boot-loader", boot)); } diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index ccac98c..b67fed7 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -45,8 +45,8 @@ public class SpringBootBuild extends Project { scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 0))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 0))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From 5316279412b966fc8e004e759409626fed2cc4fd Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 13:15:27 -0700 Subject: [PATCH 30/44] Add generic installation instructions --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ac51b0..e7a1e34 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,15 @@ [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-spring-boot/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-spring-boot) [![GitHub CI](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-spring-boot/actions/workflows/bld.yml) -To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). +To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file: + +```properties +bld.extension-spring-boot=com.uwyn.rife2:bld-spring-boot +``` + +For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation. + +## Create an Executable JAR To create a [Spring Boot executable Java Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html) (JAR) from the current project: @@ -27,6 +35,8 @@ public void bootjar() throws Exception { - [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples) +## Create an Executable WAR + To create a [Spring Boot executable Web Archive](https://docs.spring.io/spring-boot/docs/current/reference/html/executable-jar.html#appendix.executable-jar.nested-jars.war-structure) (WAR) from the current project: From 548612df7bb943294bdd619d88c47cbbedb2ea52 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 20:10:49 -0700 Subject: [PATCH 31/44] Added required dependency section --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e7a1e34..f7f6ffc 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,8 @@ public void bootwar() throws Exception { - [View Examples Project](https://github.com/rife2/bld-spring-boot/tree/main/examples) +## Required Dependency + Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java From 86d113fe31db20a5b959c4cf8b9f732a4b791458 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Mar 2025 23:41:28 -0700 Subject: [PATCH 32/44] JDK 24 --- .github/workflows/bld.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index a97b1a0..47c1b0e 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: - java-version: [ 17, 21, 23 ] + java-version: [ 17, 21, 24 ] steps: - name: Checkout source repository From 11970069df6196f08783e69d4d66312e6604a244 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 19 Mar 2025 00:39:42 -0700 Subject: [PATCH 33/44] Added Mockito dependency for JDK 24 compatibility --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 307b68a..9952664 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -30,7 +30,8 @@ public class DemoApplicationBuild extends WebProject { scope(compile) .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) - .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)); + .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)) + .include(dependency("org.mockito:mockito-core:5.16.1")); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) From e67cb22884f1d4aec5ab636616b9a0a89ee11611 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 19 Mar 2025 01:07:09 -0700 Subject: [PATCH 34/44] Added Java options for tests under JDK 24 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 9952664..8a65557 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -38,6 +38,9 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))); scope(standalone) .include(dependency("org.springframework.boot", "spring-boot-loader", boot)); + + testOperation().javaOptions(List.of("-XX:+EnableDynamicAgentLoading")) + .javaOptions().enableNativeAccess("ALL-UNNAMED"); } public static void main(String[] args) { From 00df6edbc2dfb4949bba760d494579dd5d631db6 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Mar 2025 21:05:22 -0700 Subject: [PATCH 35/44] Bump to Spring Boot 3.4.4 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 2 +- src/test/java/rife/bld/extension/BootJarOperationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 8a65557..1050a56 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -26,7 +26,7 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); - var boot = version(3, 4, 3); + var boot = version(3, 4, 4); scope(compile) .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 04f6453..08c716f 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.2.1.jar"; - private static final String BOOT_VERSION = "3.4.3"; + private static final String BOOT_VERSION = "3.4.4"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From a4c47eee813581079e8b3ee7d08566d3242a5716 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 20 Mar 2025 21:07:56 -0700 Subject: [PATCH 36/44] Bump Spring Boot Loader example to version 3.4.4 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7f6ffc..bc1a229 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Don't forget to include the _Spring Boot Loader_ dependency to your project: ```java scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.4.3")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.4.4")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) From 4ac16ecaa472ccf51bb33954611b340f65f3ab2b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 25 Mar 2025 21:18:38 -0700 Subject: [PATCH 37/44] Add OS matrix for Ubuntu, Windows and macOS --- .github/workflows/bld.yml | 18 ++++++++++++------ examples/.idea/bld.xml | 6 ++++++ 2 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 examples/.idea/bld.xml diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 47c1b0e..cfed82f 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -4,11 +4,13 @@ on: [ push, pull_request, workflow_dispatch ] jobs: build-bld-project: - runs-on: ubuntu-latest - strategy: matrix: java-version: [ 17, 21, 24 ] + kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ] + os: [ ubuntu-latest, windows-latest, macos-latest ] + + runs-on: ${{ matrix.os }} steps: - name: Checkout source repository @@ -22,12 +24,16 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Download dependencies - run: ./bld download - - name: Download dependencies [examples] working-directory: examples run: ./bld download - - name: Run tests + - name: Run tests [examples] + working-directory: examples run: ./bld compile test + + - name: Download dependencies + run: ./bld download + + - name: Run tests + run: ./bld compile test \ No newline at end of file diff --git a/examples/.idea/bld.xml b/examples/.idea/bld.xml new file mode 100644 index 0000000..6600cee --- /dev/null +++ b/examples/.idea/bld.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 1058f7719e75afe5a95d611a27713209de8084aa Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 25 Mar 2025 21:24:45 -0700 Subject: [PATCH 38/44] Add steps for boot JAR and WAR creation --- .github/workflows/bld.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index cfed82f..944b4a9 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -32,6 +32,14 @@ jobs: working-directory: examples run: ./bld compile test + - name: Compile and create the JAR [examples] + working-directory: examples + run: ./bld compile bootjar + + - name: Compile and create the WAR [examples] + working-directory: examples + run: ./bld compile bootwar + - name: Download dependencies run: ./bld download From a38a51c68f178ee507d022bcd43a0667b9145c8e Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Mar 2025 12:39:54 -0700 Subject: [PATCH 39/44] Bump PMD extension from 1.2.1 to 1.2.2 --- 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 2ff78b0..8d8e3e4 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.1 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.1 From 5bac33d62257afa81faad8e74f5c985846bed83c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Fri, 28 Mar 2025 12:47:04 -0700 Subject: [PATCH 40/44] Version 1.0.3 --- examples/lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.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 204e8d3..b6ff2db 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-boot=com.uwyn.rife2:bld-spring-boot:1.0.2 +bld.extension-boot=com.uwyn.rife2:bld-spring-boot:1.0.3 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.sourceDirectories= bld.version=2.2.1 diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index b67fed7..632272f 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(1, 0, 3, "SNAPSHOT"); + version = version(1, 0, 3); javaRelease = 17; From b74d36625516ec7939908ccaf44ab6b8bffcd132 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 12 Apr 2025 20:58:33 -0700 Subject: [PATCH 41/44] Bump JUnit to version 5.12.2 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 4 ++-- src/bld/java/rife/bld/extension/SpringBootBuild.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 1050a56..3617480 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -34,8 +34,8 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.mockito:mockito-core:5.16.1")); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2))); scope(standalone) .include(dependency("org.springframework.boot", "spring-boot-loader", boot)); diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 632272f..9b90420 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -45,8 +45,8 @@ public class SpringBootBuild extends Project { scope(compile) .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))); scope(test) - .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1))) - .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1))) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2))) .include(dependency("org.assertj", "assertj-core", version(3, 27, 3))); javadocOperation() From 36aa281834042fb5102bcf6c17e7ef27fb238264 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 12 Apr 2025 20:59:16 -0700 Subject: [PATCH 42/44] Bump Mockito to version 5.17.0 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 3617480..1857831 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -31,7 +31,7 @@ public class DemoApplicationBuild extends WebProject { .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-web", boot)) - .include(dependency("org.mockito:mockito-core:5.16.1")); + .include(dependency("org.mockito:mockito-core:5.17.0")); scope(test) .include(dependency("org.springframework.boot", "spring-boot-starter-test", boot)) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2))) From fc8304ccde30d48fc48e4615a79259152ad4ade3 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 24 Apr 2025 11:24:02 -0700 Subject: [PATCH 43/44] Bump Spring Boot to version 3.4.5 --- .../src/bld/java/com/example/demo/DemoApplicationBuild.java | 2 +- src/test/java/rife/bld/extension/BootJarOperationTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 1857831..e9c9276 100644 --- a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java +++ b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java @@ -26,7 +26,7 @@ public class DemoApplicationBuild extends WebProject { repositories = List.of(MAVEN_CENTRAL); - var boot = version(3, 4, 4); + var boot = version(3, 4, 5); scope(compile) .include(dependency("org.springframework.boot", "spring-boot-starter", boot)) .include(dependency("org.springframework.boot", "spring-boot-starter-actuator", boot)) diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 08c716f..5ee7341 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; class BootJarOperationTest { private static final String BLD = "bld-2.2.1.jar"; - private static final String BOOT_VERSION = "3.4.4"; + private static final String BOOT_VERSION = "3.4.5"; private static final String EXAMPLES_LIB_COMPILE = "examples/lib/compile/"; private static final String EXAMPLES_LIB_RUNTIME = "examples/lib/runtime/"; private static final String EXAMPLES_LIB_STANDALONE = "examples/lib/standalone/"; From 6bec436b11698dffc8c168dd2b0b29e309714dd5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 24 Apr 2025 11:24:42 -0700 Subject: [PATCH 44/44] 1.0.4-SNAPSHOT --- src/bld/java/rife/bld/extension/SpringBootBuild.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index 9b90420..d243d97 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,7 +33,7 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(1, 0, 3); + version = version(1, 0, 4, "SNAPSHOT"); javaRelease = 17;