Merge pull request #2413 from adobe/2412-correct-order-for-listversions

2412 correct order for listversions

Author: afranken

CHANGELOG.md

@@ -11,7 +11,8 @@
 * [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.4.0 - PLANNED](#440---planned)
+  * [4.5.0 - PLANNED](#450---planned)
+  * [4.4.0](#440)
   * [4.3.0](#430)
   * [4.2.0](#420)
   * [4.1.1](#411)
@@ -142,7 +143,7 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 
 **The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis.**
 
-## 4.4.0 - PLANNED
+## 4.5.0 - PLANNED
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
@@ -154,6 +155,23 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 * Version updates (build dependencies)
   * none
 
+## 4.4.0
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Fix order of ListObjectVersions (fixes #2412)
+* Refactorings
+  * Remove configuration exclusions for Spring Security classes
+    * We don't include Spring Security dependencies anymore.
+* Version updates (deliverable dependencies)
+  * Bump spring-boot.version from 3.4.5 to 3.5.0
+  * Bump aws-v2.version from 2.31.42 to 2.31.50
+* Version updates (build dependencies)
+  * Bump aws.sdk.kotlin:s3-jvm from 1.4.83 to 1.4.91
+  * Bump org.xmlunit:xmlunit-assertj3 from 2.10.0 to 2.10.2
+  * Bump com.puppycrawl.tools:checkstyle from 10.23.1 to 10.24.0
+  * Bump github/codeql-action from 3.28.17 to 3.28.18
+
 ## 4.3.0
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 

build-config/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.3.1-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-build-config</artifactId>

docker/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.adobe.testing</groupId>
     <artifactId>s3mock-parent</artifactId>
-    <version>4.3.1-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>s3mock-docker</artifactId>
@@ -70,7 +70,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.8.1</version>
         <configuration>
           <artifactItems>
             <artifactItem>

integration-tests/pom.xml

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

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

@@ -23,7 +23,6 @@ import org.junit.jupiter.api.TestInfo
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.BucketVersioningStatus
-import java.io.File
 
 internal class ListObjectVersionsIT : S3TestBase() {
   private val s3Client: S3Client = createS3Client()
@@ -47,6 +46,43 @@ internal class ListObjectVersionsIT : S3TestBase() {
       RequestBody.fromFile(UPLOAD_FILE)
     ).versionId()
 
+    val version2 = s3Client.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-1")
+      },
+      RequestBody.fromFile(UPLOAD_FILE)
+    ).versionId()
+
+    s3Client.listObjectVersions {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.versions())
+        .hasSize(2)
+        .extracting("versionId", "isLatest")
+        .containsExactly(Tuple(version2, true), Tuple(version1, false))
+    }
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun listObjectVersions_differentObjects(testInfo: TestInfo) {
+    val bucketName = givenBucket(testInfo)
+    s3Client.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val version1 = s3Client.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-1")
+      },
+      RequestBody.fromFile(UPLOAD_FILE)
+    ).versionId()
+
     val version2 = s3Client.putObject(
       {
         it.bucket(bucketName)
@@ -61,7 +97,7 @@ internal class ListObjectVersionsIT : S3TestBase() {
       assertThat(it.versions())
         .hasSize(2)
         .extracting("versionId", "isLatest")
-        .containsExactlyInAnyOrder(Tuple(version1, true), Tuple(version2, true))
+        .containsExactly(Tuple(version1, true), Tuple(version2, true))
     }
   }
 
@@ -146,7 +182,7 @@ internal class ListObjectVersionsIT : S3TestBase() {
       assertThat(it.deleteMarkers())
         .hasSize(1)
         .extracting("key")
-        .containsExactlyInAnyOrder("$UPLOAD_FILE_NAME-3")
+        .containsExactly("$UPLOAD_FILE_NAME-3")
     }
   }
 }

pom.xml

@@ -21,7 +21,7 @@
 
   <groupId>com.adobe.testing</groupId>
   <artifactId>s3mock-parent</artifactId>
-  <version>4.3.1-SNAPSHOT</version>
+  <version>4.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>S3Mock - Parent</name>
@@ -108,6 +108,7 @@
     <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
     <maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>
     <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+    <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
     <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
     <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
     <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
@@ -321,6 +322,11 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>${maven-dependency-plugin.version}</version>
+        </plugin>
         <plugin>
           <groupId>com.github.ekryd.sortpom</groupId>
           <artifactId>sortpom-maven-plugin</artifactId>
@@ -496,6 +502,7 @@
               <requireJavaVersion>
                 <version>${java.version}</version>
               </requireJavaVersion>
+              <!--dependencyConvergence/-->
             </rules>
           </configuration>
         </plugin>

server/pom.xml

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

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@
 import org.springframework.boot.Banner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
@@ -39,17 +38,7 @@
 /**
  * File Store Application that mocks Amazon S3.
  */
-@SpringBootApplication(exclude = {SecurityAutoConfiguration.class},
-    /*
-     * Also exclude ManagementWebSecurityAutoConfiguration, to prevent the
-     * erroneous activation of the CsrfFilter, which would cause access denied
-     * errors upon accesses when spring-boot-actuator is on the class path.
-     * This may be due to a bug in Spring Boot 2.1.2+. For details see
-     * https://github.com/adobe/S3Mock/issues/130
-     */
-    excludeName = {"org.springframework.boot.actuate.autoconfigure.security.servlet."
-        + "ManagementWebSecurityAutoConfiguration"}
-)
+@SpringBootApplication
 @ComponentScan(excludeFilters = {
     /*
      * TypeFilter to exclude classes with annotations that inherit {@link Component} to be

server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java

@@ -56,6 +56,7 @@
 import com.adobe.testing.s3mock.store.BucketStore;
 import com.adobe.testing.s3mock.store.ObjectStore;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -290,7 +291,9 @@ public ListVersionsResult listVersions(String bucketName,
 
       if (bucket.isVersioningEnabled()) {
         var s3ObjectVersions = objectStore.getS3ObjectVersions(bucket, id);
-        for (var s3ObjectVersion : s3ObjectVersions.versions()) {
+        var versions = new ArrayList<>(s3ObjectVersions.versions());
+        Collections.reverse(versions);
+        for (var s3ObjectVersion : versions) {
           var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucket, id, s3ObjectVersion);
           if (!s3ObjectMetadata.deleteMarker()) {
             if (objectVersions.size() > maxKeys) {

testsupport/common/pom.xml

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