Upgrade to Java 25, Spring Boot 4

SvenWoltmann · SvenWoltmann · commit 54fecea89bd2 · 2026-06-16T11:13:25.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,25 +14,25 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Fetch all history for all branches and tags (otherwise Sonar will report: "Shallow clone detected, no blame information will be provided.")
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: 20
+          java-version: 25
 
       - name: Cache SonarCloud packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
diff --git a/adapter/pom.xml b/adapter/pom.xml
@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <artifactId>testcontainers-mysql</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/adapter/src/test/java/eu/happycoders/shop/adapter/in/rest/cart/CartsControllerTest.java b/adapter/src/test/java/eu/happycoders/shop/adapter/in/rest/cart/CartsControllerTest.java
@@ -23,9 +23,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -37,9 +37,9 @@ class CartsControllerTest {
 
   @LocalServerPort private Integer port;
 
-  @MockBean AddToCartUseCase addToCartUseCase;
-  @MockBean GetCartUseCase getCartUseCase;
-  @MockBean EmptyCartUseCase emptyCartUseCase;
+  @MockitoBean AddToCartUseCase addToCartUseCase;
+  @MockitoBean GetCartUseCase getCartUseCase;
+  @MockitoBean EmptyCartUseCase emptyCartUseCase;
 
   @Test
   void givenASyntacticallyInvalidCustomerId_getCart_returnsAnError() {
diff --git a/adapter/src/test/java/eu/happycoders/shop/adapter/in/rest/product/ProductsControllerTest.java b/adapter/src/test/java/eu/happycoders/shop/adapter/in/rest/product/ProductsControllerTest.java
@@ -15,9 +15,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
@@ -28,7 +28,7 @@ class ProductsControllerTest {
 
   @LocalServerPort private Integer port;
 
-  @MockBean FindProductsUseCase findProductsUseCase;
+  @MockitoBean FindProductsUseCase findProductsUseCase;
 
   @Test
   void givenAQueryAndAListOfProducts_findProducts_requestsProductsViaQueryAndReturnsThem() {
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>com.tngtech.archunit</groupId>
-            <artifactId>archunit-junit5</artifactId>
+            <artifactId>archunit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
+            <artifactId>testcontainers-mysql</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.5</version>
+        <version>4.1.0</version>
     </parent>
 
     <groupId>eu.happycoders.shop</groupId>
@@ -24,11 +24,11 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>20</maven.compiler.source>
-        <maven.compiler.target>20</maven.compiler.target>
+        <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <pmd.version>6.55.0</pmd.version>
+        <pmd.version>7.25.0</pmd.version>
+        <lombok.version>1.18.46</lombok.version>
 
         <!-- SonarCloud configuration -->
         <sonar.projectKey>SvenWoltmann_hexagonal-architecture-java</sonar.projectKey>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.30</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -76,8 +76,13 @@
         <dependencies>
             <dependency>
                 <groupId>com.tngtech.archunit</groupId>
-                <artifactId>archunit-junit5</artifactId>
-                <version>1.1.0</version>
+                <artifactId>archunit</artifactId>
+                <version>1.4.2</version>
+            </dependency>
+            <dependency>
+                <groupId>io.rest-assured</groupId>
+                <artifactId>rest-assured</artifactId>
+                <version>6.0.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -89,22 +94,31 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.15.0</version>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.5.6</version>
             </plugin>
             <plugin>
                 <groupId>com.diffplug.spotless</groupId>
                 <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.36.0</version>
+                <version>3.6.0</version>
                 <configuration>
                     <java>
                         <googleJavaFormat>
                             <!-- Latest version can be found here: https://github.com/google/google-java-format/releases -->
-                            <version>1.17.0</version>
+                            <version>1.35.0</version>
                             <style>GOOGLE</style>
                         </googleJavaFormat>
                         <lineEndings>UNIX</lineEndings>
@@ -126,7 +140,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.5.0</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -142,7 +156,7 @@
                     <plugin>
                         <groupId>org.jacoco</groupId>
                         <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>0.8.10</version>
+                        <version>0.8.15</version>
                         <executions>
                             <execution>
                                 <id>prepare-agent</id>
@@ -167,7 +181,7 @@
                     <plugin>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-maven-plugin</artifactId>
-                        <version>4.7.3.4</version>
+                        <version>4.10.2.0</version>
                         <configuration>
                             <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                         </configuration>
@@ -185,7 +199,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-pmd-plugin</artifactId>
-                        <version>3.21.0</version>
+                        <version>3.28.0</version>
                         <configuration>
                             <targetJdk>19</targetJdk>
                             <rulesets>
@@ -218,15 +232,15 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <version>3.3.0</version>
+                        <version>3.6.0</version>
                         <configuration>
                             <configLocation>./google_checks.xml</configLocation>
                         </configuration>
                         <dependencies>
                             <dependency>
                                 <groupId>com.puppycrawl.tools</groupId>
                                 <artifactId>checkstyle</artifactId>
-                                <version>10.12.0</version>
+                                <version>13.5.0</version>
                             </dependency>
                         </dependencies>
                         <executions>
