Bump Spring Boot to 4.0.0

Use Java 25 to compile, target Java 17.

Author: afranken

CHANGELOG.md

@@ -148,15 +148,18 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
   * JUnit 4.x deprecation
     * Remove JUnit 4.x support.
   * Remove legacy properties for S3Mock configuration.
-  * Move all controller-related code from "com.adobe.testing.s3mock" to com.adobe.testing.s3mock.controller package.
+  * Move all controller-related code from "com.adobe.testing.s3mock" to "com.adobe.testing.s3mock.controller" package.
   * Remove Apache libraries like "commons-compress", "commons-codec" or "commons-lang3" from dependencies. Kotlin and Java standard library provide similar functionality.
 * Version updates
-  * Bump Spring Boot version to 4.x
-  * Bump Spring Framework version to 7.x
+  * Bump Spring Boot version to 4.0.0
+  * Bump Spring Framework version to 7.0.1
   * Bump java version from 17 to 25
-    * S3Mock will use the baseline Spring chooses to support.
-    * The Docker container will run Java 25 LTS.
-  * TestContainers from 1.x to 2.x
+    * Compile with Java 25, target Java 17
+    * Docker container runs Java 25
+  * Bump TestContainers to 2.0.2
+  * Bump Alpine Linux to 3.23.0 (release: December 2025)
+    * This is the latest version of Alpine Linux that supports Java 25.
+  * Bump Maven to 4.0.0
 
 # CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.

pom.xml

@@ -76,10 +76,10 @@
   </distributionManagement>
 
   <properties>
-    <!--  TODO: Upgrade to Java 25 release in November  -->
-    <java.version>21</java.version>
+    <java.version>25</java.version>
+    <java.target.version>17</java.target.version>
     <kotlin.version>2.2.21</kotlin.version>
-    <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
+    <kotlin.compiler.jvmTarget>${java.target.version}</kotlin.compiler.jvmTarget>
     <kotlin.compiler.apiVersion>2.2</kotlin.compiler.apiVersion>
     <kotlin.compiler.languageVersion>2.2</kotlin.compiler.languageVersion>
     <kotlin-coroutines.version>1.10.2</kotlin-coroutines.version>
@@ -124,7 +124,7 @@
     <!-- Run Docker build by default -->
     <skipDocker>false</skipDocker>
     <sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
-    <spring-boot.version>4.0.0-RC2</spring-boot.version>
+    <spring-boot.version>4.0.0</spring-boot.version>
     <testcontainers.version>2.0.2</testcontainers.version>
     <testng.version>7.11.0</testng.version>
     <xmlunit-assertj3.version>2.11.0</xmlunit-assertj3.version>
@@ -471,7 +471,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven-compiler-plugin.version}</version>
           <configuration>
-            <release>${java.version}</release>
+            <release>${java.target.version}</release>
             <encoding>${project.build.sourceEncoding}</encoding>
             <parameters>true</parameters>
           </configuration>
@@ -512,7 +512,7 @@
           <configuration>
             <rules>
               <requireMavenVersion>
-                <version>[3.5,)</version>
+                <version>[3.9,)</version>
               </requireMavenVersion>
               <requireJavaVersion>
                 <version>${java.version}</version>

server/src/main/kotlin/com/adobe/testing/s3mock/controller/ControllerConfiguration.kt

@@ -89,7 +89,8 @@ class ControllerConfiguration : WebMvcConfigurer {
     val mediaTypes = listOf(
       MediaType.APPLICATION_XML,
       MediaType.APPLICATION_FORM_URLENCODED,
-      MediaType.APPLICATION_OCTET_STREAM
+      MediaType.APPLICATION_OCTET_STREAM,
+      MediaType.TEXT_XML
     )
 
     val mapper = XmlMapper.builder()