From 5f91af718f03063539f406970b50e7a0ffe921aa Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Mar 2024 13:24:58 -0700 Subject: [PATCH 1/4] Bumped Spring Boot to version 3.2.4 --- README.md | 2 +- examples/lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes .../example/demo/DemoApplicationBuild.java | 10 +++++----- lib/bld/bld-wrapper.jar | Bin 27319 -> 27319 bytes .../bld/extension/BootJarOperationTest.java | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0df50ca..75232ad 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.2.3")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.2.4")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index e63713531201055d2d5d71dfd5204bbdd65996a0..e8151771783f2379f035bbdc7afea15ebd09faaa 100644 GIT binary patch delta 131 zcmdmfm2vx3M&1B#W)=|!4h{~6NhP@xdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 wGi1{Y!BUe0GweYElP705gXx(^b delta 131 zcmdmfm2vx3M&1B#W)=|!4h{~6M{6S|^42i}sf~R~#vpq0X5(%qFvHP|T@TFgPC3sA wX2_-)f~6)0X4r!SCQr_A2Gch)Ji)YTW(b(B$#ezNM>69e;#vM+x;)DP07`l`ivR!s diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index c00143b..0f81767 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.2.3")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.2.3")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.2.3")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.2.4")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.2.4")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.2.4")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.2.3")) + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.2.4")) .include(dependency("org.junit.jupiter:junit-jupiter:5.10.2")) .include(dependency("org.junit.platform:junit-platform-console-standalone:1.10.2")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.2.3")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.2.4")); } public static void main(String[] args) { diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index e63713531201055d2d5d71dfd5204bbdd65996a0..e8151771783f2379f035bbdc7afea15ebd09faaa 100644 GIT binary patch delta 131 zcmdmfm2vx3M&1B#W)=|!4h{~6NhP@xdFz;g)W$v~V-UT0vvD^QnBi!~t_Nm#r<`X5 wGi1{Y!BUe0GweYElP705gXx(^b delta 131 zcmdmfm2vx3M&1B#W)=|!4h{~6M{6S|^42i}sf~R~#vpq0X5(%qFvHP|T@TFgPC3sA wX2_-)f~6)0X4r!SCQr_A2Gch)Ji)YTW(b(B$#ezNM>69e;#vM+x;)DP07`l`ivR!s diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 69b01b7..1652ee6 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -152,9 +152,9 @@ class BootJarOperationTest { """; private static final String MAIN_CLASS = "com.example.Foo"; private static final String PROVIDED_LIB = "LatencyUtils-2.0.3.jar"; - private static final String SPRING_BOOT = "spring-boot-3.2.3.jar"; - private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-3.2.3.jar"; - private static final String SPRING_BOOT_LOADER = "spring-boot-loader-3.2.3.jar"; + private static final String SPRING_BOOT = "spring-boot-3.2.4.jar"; + private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-3.2.4.jar"; + private static final String SPRING_BOOT_LOADER = "spring-boot-loader-3.2.4.jar"; private StringBuilder readJarEntries(File jar) throws IOException { var jarEntries = new StringBuilder(); From 6640c19931b89444d3a240408f27383e12bd8a0c Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 30 Mar 2024 22:23:09 -0700 Subject: [PATCH 2/4] Bumped actions to latest versions --- .github/workflows/bld.yml | 4 ++-- .github/workflows/pages.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 82d7da4..5dfe8d2 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -12,12 +12,12 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: "zulu" java-version: ${{ matrix.java-version }} diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 2120d4c..e191f6d 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -30,14 +30,14 @@ jobs: steps: - name: Checkout source repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - distribution: 'zulu' + distribution: "zulu" java-version: 17 - name: Build Javadocs @@ -50,8 +50,8 @@ jobs: uses: actions/upload-pages-artifact@v1 with: # Upload generated Javadocs repository - path: 'build/javadoc/' + path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v1 \ No newline at end of file + uses: actions/deploy-pages@v1 From b9d7c9edf9d6fdfc2b6077418403073e5dd5c13a Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 30 Mar 2024 22:36:28 -0700 Subject: [PATCH 3/4] Version 0.9.3 --- config/pmd.xml | 10 +++++----- examples/lib/bld/bld-wrapper.properties | 2 +- lib/bld/bld-wrapper.properties | 2 +- src/bld/java/rife/bld/extension/SpringBootBuild.java | 6 +++--- .../java/rife/bld/extension/BootJarOperationTest.java | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/pmd.xml b/config/pmd.xml index cb0b643..39909f7 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -19,12 +19,13 @@ + - + @@ -35,8 +36,9 @@ - + + @@ -52,8 +54,6 @@ - - @@ -107,4 +107,4 @@ - \ No newline at end of file + diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index b42bb61..d82375b 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.2 +bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.3 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index 69f1830..9973999 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.7 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.8 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/src/bld/java/rife/bld/extension/SpringBootBuild.java b/src/bld/java/rife/bld/extension/SpringBootBuild.java index a8adb7f..f0b0621 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, 2); + version = version(0, 9, 3); javaRelease = 17; downloadSources = true; @@ -42,7 +42,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(1, 8, 0, "SNAPSHOT"))); + .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0))); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))) @@ -71,7 +71,7 @@ public class SpringBootBuild extends Project { .license( new PublishLicense() .name("The Apache License, Version 2.0") - .url("http://www.apache.org/licenses/LICENSE-2.0.txt") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) .scm( new PublishScm() diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 1652ee6..5c0b828 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -34,7 +34,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-1.8.0-20240107.042858-1.jar"; + private static final String BLD = "bld-1.9.0.jar"; 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 82bfc15521dd22d61c3157dda6b0b72e97634ee1 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 18 Apr 2024 13:14:21 -0700 Subject: [PATCH 4/4] Bumped Spring Boot to version 3.2.5 --- README.md | 2 +- examples/lib/bld/bld-wrapper.properties | 2 +- .../java/com/example/demo/DemoApplicationBuild.java | 10 +++++----- .../java/rife/bld/extension/SpringBootBuild.java | 3 ++- .../rife/bld/extension/BootJarOperationTest.java | 13 +++++++------ 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 75232ad..86de5fe 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.2.4")); + .include(dependency("org.springframeworkboot:spring-boot-loader:3.2.5")); ``` Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary) diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index d82375b..3293405 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.3 +bld.extensions=com.uwyn.rife2:bld-spring-boot:0.9.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= bld.sourceDirectories= diff --git a/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java b/examples/src/bld/java/com/example/demo/DemoApplicationBuild.java index 0f81767..0dd5f9b 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.2.4")) - .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.2.4")) - .include(dependency("org.springframework.boot:spring-boot-starter-web:3.2.4")); + .include(dependency("org.springframework.boot:spring-boot-starter:3.2.5")) + .include(dependency("org.springframework.boot:spring-boot-starter-actuator:3.2.5")) + .include(dependency("org.springframework.boot:spring-boot-starter-web:3.2.5")); scope(test) - .include(dependency("org.springframework.boot:spring-boot-starter-test:3.2.4")) + .include(dependency("org.springframework.boot:spring-boot-starter-test:3.2.5")) .include(dependency("org.junit.jupiter:junit-jupiter:5.10.2")) .include(dependency("org.junit.platform:junit-platform-console-standalone:1.10.2")); scope(standalone) - .include(dependency("org.springframework.boot:spring-boot-loader:3.2.4")); + .include(dependency("org.springframework.boot:spring-boot-loader:3.2.5")); } 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 f0b0621..53fa491 100644 --- a/src/bld/java/rife/bld/extension/SpringBootBuild.java +++ b/src/bld/java/rife/bld/extension/SpringBootBuild.java @@ -33,9 +33,10 @@ public class SpringBootBuild extends Project { public SpringBootBuild() { pkg = "rife.bld.extension"; name = "bld-spring-boot"; - version = version(0, 9, 3); + version = version(0, 9, 4); javaRelease = 17; + downloadSources = true; autoDownloadPurge = true; diff --git a/src/test/java/rife/bld/extension/BootJarOperationTest.java b/src/test/java/rife/bld/extension/BootJarOperationTest.java index 5c0b828..5fa1daa 100644 --- a/src/test/java/rife/bld/extension/BootJarOperationTest.java +++ b/src/test/java/rife/bld/extension/BootJarOperationTest.java @@ -128,9 +128,10 @@ class BootJarOperationTest { org/springframework/boot/loader/zip/CloseableDataBlock.class org/springframework/boot/loader/zip/DataBlock.class org/springframework/boot/loader/zip/DataBlockInputStream.class - org/springframework/boot/loader/zip/FileChannelDataBlock$ManagedFileChannel.class - org/springframework/boot/loader/zip/FileChannelDataBlock$Tracker.class - org/springframework/boot/loader/zip/FileChannelDataBlock.class + org/springframework/boot/loader/zip/FileDataBlock$FileAccess.class + org/springframework/boot/loader/zip/FileDataBlock$Tracker$1.class + org/springframework/boot/loader/zip/FileDataBlock$Tracker.class + org/springframework/boot/loader/zip/FileDataBlock.class org/springframework/boot/loader/zip/NameOffsetLookups.class org/springframework/boot/loader/zip/VirtualDataBlock.class org/springframework/boot/loader/zip/VirtualZipDataBlock$DataPart.class @@ -152,9 +153,9 @@ class BootJarOperationTest { """; private static final String MAIN_CLASS = "com.example.Foo"; private static final String PROVIDED_LIB = "LatencyUtils-2.0.3.jar"; - private static final String SPRING_BOOT = "spring-boot-3.2.4.jar"; - private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-3.2.4.jar"; - private static final String SPRING_BOOT_LOADER = "spring-boot-loader-3.2.4.jar"; + private static final String SPRING_BOOT = "spring-boot-3.2.5.jar"; + private static final String SPRING_BOOT_ACTUATOR = "spring-boot-actuator-3.2.5.jar"; + private static final String SPRING_BOOT_LOADER = "spring-boot-loader-3.2.5.jar"; private StringBuilder readJarEntries(File jar) throws IOException { var jarEntries = new StringBuilder();