feat(maven): migrate to maven 4

.github/workflows/build-main.yml

@@ -77,7 +77,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract Maven project version for Asciidoc GitHub Pages directory naming
-        run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+        run: echo ::set-output name=version::$(./mvnw -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
         id: project
 
       - name: Show extracted Maven project version

.mvn/wrapper/maven-wrapper.properties

@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip

CONTRIBUTING.md

@@ -7,9 +7,9 @@ You can find some hints for starting development in the [README](spring-boot-adm
 ### Java / Server
 We try to satisfy the [Code Style of Spring Framework](https://github.com/spring-projects/spring-framework/wiki/Code-Style).
 
-The [Spring Java Format Plugin](https://github.com/spring-io/spring-javaformat) is added to the build. Checkstyle will enforce the consistency of the code. Nevertheless there are some disabled rules, due to backward compatibility. You can find these disabled rules in a comment in `src/checkstyle/checkstyle.xml`.
+The [Spring Java Format Plugin](https://github.com/spring-io/spring-javaformat) is added to the build. Checkstyle will enforce the consistency of the code. Nevertheless, there are some disabled rules, due to backward compatibility. You can find these disabled rules in a comment in `src/checkstyle/checkstyle.xml`.
 
-However, you can always run `mvn spring-javaformat:apply` to fix some basic errors, like indentation.
+However, you can always run `./mvnw spring-javaformat:apply` to fix some basic errors, like indentation.
 
 ### JavaScript / Client
 The Vue frontend implements basic prettier rules as well as Vue3 recommended rules.
@@ -21,7 +21,7 @@ Append `:fix` to let eslint or prettier auto-solve most issues.
 The IntelliJ settings are based on the IntelliJ-IDEA-Editor-Settings from spring, but have been adapted slightly, you can find the original settings [here](https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings).
 The custom settings are stored in `.editorconfig` and are imported automatically by IntelliJ.
 If you are using IntelliJ, there is also a [formatter-plugin provided by Spring](https://github.com/spring-io/spring-javaformat#intellij-idea).
-(i) Plugin version x didn't not work in IntelliJ IDEA Ultimate 2020.3.
+(i) Plugin version x did not work in IntelliJ IDEA Ultimate 2020.3.
 
 #### Checkstyle Plugin
 This plugin scans Java files with the project's custom CheckStyle rules from within IDEA.

pom.xml

@@ -35,22 +35,26 @@
         <java.version>17</java.version>
         <node.version>v22.12.0</node.version>
 
+        <require.maven.version>[4.0.0-rc-4,)</require.maven.version>
+
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <resource.delimiter>@</resource.delimiter>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+        <!-- required for later replacement of argLine -->
+        <argLine/>
+
         <!-- used dependencies versions -->
         <spring-boot.version>3.5.3</spring-boot.version>
         <spring-cloud.version>2025.0.0</spring-cloud.version>
-        <jolokia-support-spring.version>2.2.9</jolokia-support-spring.version>
 
         <checkstyle.version>10.26.1</checkstyle.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 
         <wiremock.version>3.13.1</wiremock.version>
-        <hazelcast-tests.version>5.5.0</hazelcast-tests.version>
+        <hazelcast.version>5.5.0</hazelcast.version>
         <awaitility.version>4.3.0</awaitility.version>
         <testcontainers.version>1.21.3</testcontainers.version>
         <jetty.version>12.0.23</jetty.version>
@@ -72,7 +76,6 @@
         <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
         <maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
         <frontend-maven-plugin.version>1.15.1</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
@@ -81,15 +84,16 @@
         <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
         <spring-javaformat-maven-plugin.version>0.0.47</spring-javaformat-maven-plugin.version>
         <central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
+        <spring-conf-prop-documenter-maven-plugin.version>0.7.1</spring-conf-prop-documenter-maven-plugin.version>
     </properties>
 
     <modules>
+        <module>spring-boot-admin-dependencies</module>
+        <module>spring-boot-admin-build</module>
         <module>spring-boot-admin-server</module>
         <module>spring-boot-admin-server-ui</module>
         <module>spring-boot-admin-client</module>
-        <module>spring-boot-admin-dependencies</module>
         <module>spring-boot-admin-docs</module>
-        <module>spring-boot-admin-build</module>
         <module>spring-boot-admin-starter-server</module>
         <module>spring-boot-admin-starter-client</module>
         <module>spring-boot-admin-samples</module>
@@ -223,7 +227,7 @@
                         <configuration>
                             <rules>
                                 <requireMavenVersion>
-                                    <version>3.9</version>
+                                    <version>${require.maven.version}</version>
                                 </requireMavenVersion>
                             </rules>
                         </configuration>
@@ -332,7 +336,7 @@
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <rerunFailingTestsCount>2</rerunFailingTestsCount>
+                        <argLine>@{argLine} -Xshare:off</argLine>
                         <includes>
                             <include>**/*Tests.java</include>
                             <include>**/*Test.java</include>
@@ -395,6 +399,11 @@
                     <artifactId>central-publishing-maven-plugin</artifactId>
                     <version>${central-publishing-maven-plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.rodnansol</groupId>
+                    <artifactId>spring-configuration-property-documenter-maven-plugin</artifactId>
+                    <version>${spring-conf-prop-documenter-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

spring-boot-admin-build/pom.xml

@@ -38,7 +38,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
+                <version>3.5.3</version> <!-- hardcoded to fix issues with sbom, should be ${spring-boot.version} -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -50,7 +50,7 @@
             <dependency>
                 <groupId>com.hazelcast</groupId>
                 <artifactId>hazelcast</artifactId>
-                <version>${hazelcast-tests.version}</version>
+                <version>${hazelcast.version}</version>
                 <classifier>tests</classifier>
             </dependency>
             <dependency>
@@ -59,6 +59,12 @@
                 <version>${findbugs-jsr305.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-alpn-server</artifactId>
+                <version>${jetty.version}</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.awaitility</groupId>
                 <artifactId>awaitility</artifactId>
@@ -77,6 +83,14 @@
                 <version>${testcontainers.version}</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- Maven 4 related fixes: delete as soon as not needed! -->
+            <dependency>
+                <groupId>org.springframework.retry</groupId>
+                <artifactId>spring-retry</artifactId>
+                <version>2.0.12</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 

spring-boot-admin-client/pom.xml

@@ -82,7 +82,6 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

spring-boot-admin-docs/pom.xml

@@ -80,7 +80,6 @@
             <plugin>
                 <groupId>org.rodnansol</groupId>
                 <artifactId>spring-configuration-property-documenter-maven-plugin</artifactId>
-                <version>0.7.1</version>
                 <executions>
                     <execution>
                         <id>generate-adoc</id>

spring-boot-admin-samples/pom.xml

@@ -34,19 +34,26 @@
     </parent>
 
     <modules>
+        <module>spring-boot-admin-sample-custom-ui</module>
         <module>spring-boot-admin-sample-servlet</module>
         <module>spring-boot-admin-sample-reactive</module>
         <module>spring-boot-admin-sample-war</module>
         <module>spring-boot-admin-sample-hazelcast</module>
-        <module>spring-boot-admin-sample-custom-ui</module>
     </modules>
 
+    <properties>
+        <jolokia-support-spring.version>2.2.9</jolokia-support-spring.version>
+
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <cyclonedx-maven-plugin.version>2.9.1</cyclonedx-maven-plugin.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
+                <version>2025.0.0</version> <!-- hardcoded to fix issues with sbom, should be ${spring-cloud.version} -->
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -55,14 +62,19 @@
                 <artifactId>spring-boot-admin-sample-custom-ui</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jolokia</groupId>
+                <artifactId>jolokia-support-spring</artifactId>
+                <version>${jolokia-support-spring.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
         <!-- Turn on filtering by default for application properties -->
         <resources>
             <resource>
-                <directory>${basedir}/src/main/resources</directory>
+                <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
                     <include>**/application*.yml</include>
@@ -71,7 +83,7 @@
                 </includes>
             </resource>
             <resource>
-                <directory>${basedir}/src/main/resources</directory>
+                <directory>${project.basedir}/src/main/resources</directory>
                 <excludes>
                     <exclude>**/application*.yml</exclude>
                     <exclude>**/application*.yaml</exclude>
@@ -99,6 +111,11 @@
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>${spring-boot.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.cyclonedx</groupId>
+                    <artifactId>cyclonedx-maven-plugin</artifactId>
+                    <version>${cyclonedx-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/pom.xml

@@ -75,15 +75,27 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.outputDirectory}/META-INF/spring-boot-admin-server-ui/extensions/custom
+                            </outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.directory}/dist</directory>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
-
-        <resources>
-            <resource>
-                <directory>target/dist</directory>
-                <targetPath>META-INF/spring-boot-admin-server-ui/extensions/custom</targetPath>
-                <filtering>false</filtering>
-            </resource>
-        </resources>
     </build>
 </project>

spring-boot-admin-samples/spring-boot-admin-sample-servlet-graalvm/pom.xml

@@ -32,6 +32,7 @@
     </parent>
 
     <properties>
+        <zstd-jni.version>1.5.7-4</zstd-jni.version>
         <native-build-tools-plugin.version>0.10.6</native-build-tools-plugin.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
     </properties>
@@ -53,7 +54,7 @@
         <dependency>
             <groupId>com.github.luben</groupId>
             <artifactId>zstd-jni</artifactId>
-            <version>1.5.7-4</version>
+            <version>${zstd-jni.version}</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

spring-boot-admin-samples/spring-boot-admin-sample-servlet/pom.xml

@@ -79,7 +79,6 @@
         <dependency>
             <groupId>org.jolokia</groupId>
             <artifactId>jolokia-support-spring</artifactId>
-            <version>${jolokia-support-spring.version}</version>
         </dependency>
         <!-- Test -->
         <dependency>
@@ -95,19 +94,21 @@
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
-                <version>2.9.1</version>
                 <executions>
                     <execution>
-                        <phase>validate</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>makeAggregateBom</goal>
                         </goals>
+                        <configuration>
+                            <projectType>application</projectType>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                            <outputName>bom</outputName>
+                            <outputFormat>json</outputFormat>
+                            <skipAttach>true</skipAttach>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <outputFormat>json</outputFormat>
-                    <outputName>classes/bom</outputName>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>