Add AWS SDK V1 deprecation notice

afranken · afranken · commit c87be20e4ef2 · 2025-04-07T01:01:40.000+02:00
AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
S3Mock will remove usage of Java v1 early 2026.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -120,6 +120,8 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 * Features and fixes
   * TBD
 * Refactorings
+  * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
+    * S3Mock will remove usage of Java v1 early 2026.
   * Looking to Remove unit test modules. This enables
     * Refactoring S3Mock to a "standard" Spring Boot application.
     * Removal of workarounds to use `S3MockApplication#start` from a static context
@@ -168,6 +170,9 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
   * Allow overriding headers in head object
   * Implement If-(Un)modified-Since handling (fixes #829)
   * Close all InputStreams and OutputStreams
+  * Add AWS SDK V1 deprecation notice
+    * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
+    * S3Mock will remove usage of Java v1 early 2026.
 * Refactorings
   * Use Tomcat instead of Jetty as the application container (fixes #2136)
   * "FROM" in Dockerfile did not match "as"
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt
@@ -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.
@@ -32,6 +32,8 @@ import java.util.stream.Collectors
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class BucketV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt
@@ -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.
@@ -36,6 +36,8 @@ import java.util.UUID
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class CopyObjectV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt
@@ -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.
@@ -41,6 +41,8 @@ import java.util.UUID
  * Test the application using the AmazonS3 SDK V1.
  * Verifies S3 Mocks Error Responses.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ErrorResponsesV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt
@@ -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.
@@ -51,6 +51,8 @@ import kotlin.math.min
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class GetPutDeleteObjectV1IT : S3TestBase() {
 
   private val httpClient: CloseableHttpClient = createHttpClient()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt
@@ -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.
@@ -33,6 +33,8 @@ import java.util.stream.Collectors
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1IT : S3TestBase() {
 
   val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt
@@ -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.
@@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1MaxKeysIT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt
@@ -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.
@@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1PaginationIT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt
@@ -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.
@@ -42,6 +42,8 @@ import java.util.UUID
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class MultiPartUploadV1IT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt
@@ -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.
@@ -29,6 +29,8 @@ import java.io.File
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ObjectTaggingV1IT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt
@@ -121,10 +121,14 @@ internal abstract class S3TestBase {
       .build()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun createS3ClientV1(endpoint: String = serviceEndpoint): AmazonS3 {
     return defaultTestAmazonS3ClientBuilder(endpoint).build()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun defaultTestAmazonS3ClientBuilder(endpoint: String = serviceEndpoint): AmazonS3ClientBuilder {
     return AmazonS3ClientBuilder.standard()
       .withCredentials(AWSStaticCredentialsProvider(BasicAWSCredentials(accessKeyId, secretAccessKey)))
@@ -135,6 +139,8 @@ internal abstract class S3TestBase {
       .enablePathStyleAccess()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun createTransferManagerV1(endpoint: String = serviceEndpoint,
       s3Client: AmazonS3 = createS3ClientV1(endpoint)): TransferManager {
     val threadFactory: ThreadFactory = object : ThreadFactory {
@@ -295,25 +301,35 @@ internal abstract class S3TestBase {
     return bucketName
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenBucketV1(testInfo: TestInfo): String {
     val bucketName = bucketName(testInfo)
     return givenBucketV1(bucketName)
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   private fun givenBucketV1(bucketName: String): String {
     _s3Client.createBucket(bucketName)
     return bucketName
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenRandomBucketV1(): String {
     return givenBucketV1(randomName)
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   private fun givenObjectV1(bucketName: String, key: String): PutObjectResult {
     val uploadFile = File(key)
     return _s3Client.putObject(PutObjectRequest(bucketName, key, uploadFile))
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenBucketAndObjectV1(testInfo: TestInfo, key: String): Pair<String, PutObjectResult> {
     val bucketName = givenBucketV1(testInfo)
     val putObjectResult = givenObjectV1(bucketName, key)
diff --git a/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java b/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2023 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.
@@ -93,7 +93,9 @@ public S3Client createS3ClientV2() {
    * server using HTTPS.
    *
    * @return The {@link AmazonS3} instance.
+   * @deprecated The AWS SDK for Java 1.x entered maintenance mode starting July 31, 2024 and will reach end of support on December 31, 2025. For more information, see https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-1-x-is-in-maintenance-mode-effective-july-31-2024/
    */
+  @Deprecated(since = "4.0.0", forRemoval = true)
   public AmazonS3 createS3Client() {
     return createS3Client("us-east-1");
   }
@@ -105,7 +107,9 @@ public AmazonS3 createS3Client() {
    * @param region Region to define regional endpoint.
    *
    * @return The {@link AmazonS3} instance.
+   * @deprecated The AWS SDK for Java 1.x entered maintenance mode starting July 31, 2024 and will reach end of support on December 31, 2025. For more information, see https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-1-x-is-in-maintenance-mode-effective-july-31-2024/
    */
+  @Deprecated(since = "4.0.0", forRemoval = true)
   public AmazonS3 createS3Client(final String region) {
     var credentials = new BasicAWSCredentials("foo", "bar");
 
