Bumped Spring Boot to version 3.2.5

.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 }}

.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
+        uses: actions/deploy-pages@v1

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.5"));
 ```
 
 Please check the [BootJarOperation documentation](https://rife2.github.io/bld-spring-boot/rife/bld/extension/BootJarOperation.html#method-summary)

config/pmd.xml

@@ -19,12 +19,13 @@
         </properties>
     </rule>
 
+
     <!-- CODE STYLE -->
     <rule ref="category/java/codestyle.xml">
         <exclude name="AtLeastOneConstructor"/>
         <exclude name="ClassNamingConventions"/>
-        <exclude name="ConfusingTernary"/>
         <exclude name="CommentDefaultAccessModifier"/>
+        <exclude name="ConfusingTernary"/>
         <exclude name="FieldNamingConventions"/>
         <exclude name="LocalVariableCouldBeFinal"/>
         <exclude name="LocalVariableNamingConventions"/>
@@ -35,8 +36,9 @@
         <exclude name="ShortClassName"/>
         <exclude name="ShortMethodName"/>
         <exclude name="ShortVariable"/>
-        <exclude name="UselessParentheses"/>
+        <exclude name="UseExplicitTypes"/>
         <exclude name="UseUnderscoresInNumericLiterals"/>
+        <exclude name="UselessParentheses"/>
     </rule>
 
     <rule ref="category/java/codestyle.xml/UnnecessaryImport">
@@ -52,8 +54,6 @@
         <exclude name="AvoidUncheckedExceptionsInSignatures"/>
         <exclude name="CognitiveComplexity"/>
         <exclude name="CyclomaticComplexity"/>
-        <exclude name="ExcessiveClassLength"/>
-        <exclude name="ExcessiveMethodLength"/>
         <exclude name="ExcessiveParameterList"/>
         <exclude name="ExcessivePublicCount"/>
         <exclude name="GodClass"/>
@@ -107,4 +107,4 @@
     <!-- SECURITY -->
     <rule ref="category/java/security.xml">
     </rule>
-</ruleset>
+</ruleset>

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.4
 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=

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.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.3"))
+                .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.3"));
+                .include(dependency("org.springframework.boot:spring-boot-loader:3.2.5"));
     }
 
     public static void main(String[] args) {

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=

src/bld/java/rife/bld/extension/SpringBootBuild.java

@@ -33,16 +33,17 @@ public class SpringBootBuild extends Project {
     public SpringBootBuild() {
         pkg = "rife.bld.extension";
         name = "bld-spring-boot";
-        version = version(0, 9, 2);
+        version = version(0, 9, 4);
 
         javaRelease = 17;
+        
         downloadSources = true;
         autoDownloadPurge = true;
 
         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 +72,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()

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/";
@@ -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.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.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();