Merge pull request #2626 from adobe/maintenance

Prepare for 4.9.0

Author: afranken

.github/workflows/maven-ci-and-prb.yml

@@ -48,8 +48,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
-          java-version: 21
-          distribution: 'temurin'
+          java-version: 25
+          distribution: 'oracle'
           cache: 'maven'
       - name: Build with Maven
         run: ./mvnw -B -V -Dstyle.color=always clean verify

CHANGELOG.md

@@ -8,8 +8,9 @@ Whenever a 3rd party library is updated, S3Mock will update it's MINOR version.
 * [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
   * [Planned changes](#planned-changes)
 * [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
+  * [4.11.0 - PLANNED](#4110---planned)
   * [4.10.0 - PLANNED](#4100---planned)
-  * [4.9.0 - PLANNED](#490---planned)
+  * [4.9.0](#490)
   * [4.8.0](#480)
   * [4.7.0](#470)
   * [4.6.0](#460)
@@ -148,24 +149,43 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 # CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
-**The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis.**
+**The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis. We usually follow the Spring Boot release cycle.**
 
-## 4.10.0 - PLANNED
+## 4.11.0 - PLANNED
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
+**This is the last currently planned minor release of 4.x.**
+
 * Features and fixes
   * TBD
 * Refactorings
   * TBD
 * Version updates (deliverable dependencies)
+  * Update to Spring Boot 3.5.8
+    * Planned release November 20th 2025
+    * TBD: link to milestone
+* Version updates (build dependencies)
   * TBD
+
+## 4.10.0 - PLANNED
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * TBD
+* Refactorings
+  * TBD
+* Version updates (deliverable dependencies)
+  * Update to Spring Boot 3.5.7
+    * Planned release October 23rd 2025
+    * https://github.com/spring-projects/spring-boot/milestone/399
 * Version updates (build dependencies)
   * TBD
 
-## 4.9.0 - PLANNED
+## 4.9.0
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
+  * Remove Content-Type expectation from PutBucketVersioning (Fixes #2635)
   * Let S3Mock validate bucket names according to AWS rules
 * Refactorings
   * Let TaggingHeaderConverter convert XML tags
@@ -177,11 +197,21 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
   * Build: update Google Checkstyle to the latest version and fix violations.
   * Build: use ktlint-maven-plugin to validate Kotlin code style.
 * Version updates (deliverable dependencies)
-  * TBD
+  * Bump spring-boot.version from 3.5.5 to 3.5.6
+  * Bump aws-v2.version from 2.32.31 to 2.33.12
+  * Bump aws.version from 1.12.788 to 1.12.791
 * Version updates (build dependencies)
+  * Bump Java 21 to Java 25 to build S3Mock.
+  * Bump kotlin.version from 2.2.10 to 2.2.20
+  * Bump aws.sdk.kotlin:s3-jvm from 1.5.26 to 1.5.41
+  * Bump org.xmlunit:xmlunit-assertj3 from 2.10.3 to 2.10.4
+  * Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.3 to 3.5.4
+  * Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.3 to 3.5.4
   * Bump com.puppycrawl.tools:checkstyle from 11.0.0 to 11.0.1
+  * Bump digital.pragmatech.testing:spring-test-profiler from 0.0.11 to 0.0.12
   * Bump actions/stale from 9.1.0 to 10.0.0
-  * Bump github/codeql-action from 3.29.11 to 3.30.1
+  * Bump github/codeql-action from 3.29.11 to 3.30.3
+  * Bump step-security/harden-runner from 2.13.0 to 2.13.1
   * Bump maven from 3.9.9 to 3.9.11
   * Bump maven wrapper from 3.3.2 to 3.3.3
 

README.md

@@ -64,6 +64,7 @@
   * [Contributing](#contributing)
   * [Licensing](#licensing)
   * [Powered by](#powered-by)
+  * [Star History](#star-history)
 <!-- TOC -->
 
 ## S3Mock

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>

integration-tests/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-integration-tests</artifactId>

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/VersionsIT.kt

@@ -238,14 +238,15 @@ internal class VersionsIT : S3TestBase() {
         RequestBody.fromFile(UPLOAD_FILE),
       ).versionId()
 
-    s3Client
-      .putObject(
-        {
-          it.bucket(bucketName)
-          it.key(UPLOAD_FILE_NAME)
-        },
-        RequestBody.fromFile(UPLOAD_FILE),
-      ).versionId()
+    val versionId =
+      s3Client
+        .putObject(
+          {
+            it.bucket(bucketName)
+            it.key(UPLOAD_FILE_NAME)
+          },
+          RequestBody.fromFile(UPLOAD_FILE),
+        ).versionId()
 
     s3Client
       .deleteObject {
@@ -255,6 +256,11 @@ internal class VersionsIT : S3TestBase() {
         assertThat(it.deleteMarker()).isEqualTo(true)
       }
 
+    val listObjectVersions = s3Client.listObjectVersions { it.bucket(bucketName) }
+    assertThat(listObjectVersions.hasVersions()).isTrue
+    assertThat(listObjectVersions.versions()[0].key()).isEqualTo(UPLOAD_FILE_NAME)
+    assertThat(listObjectVersions.versions()[0].versionId()).isEqualTo(versionId)
+
     assertThatThrownBy {
       s3Client.getObject {
         it.bucket(bucketName)

pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>4.8.1-SNAPSHOT</version>
+  <version>4.9.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>

server/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock</artifactId>

server/src/main/java/com/adobe/testing/s3mock/BucketController.java

@@ -231,8 +231,7 @@ public ResponseEntity<VersioningConfiguration> getVersioningConfiguration(@PathV
       },
       params = {
           VERSIONING
-      },
-      consumes = APPLICATION_XML_VALUE
+      }
   )
   @S3Verified(year = 2025)
   public ResponseEntity<Void> putVersioningConfiguration(

testsupport/common/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-testsupport-reactor</artifactId>
-    <version>4.8.1-SNAPSHOT</version>
+    <version>4.9.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-testsupport-common</artifactId>