Remove AWS SDK v1 and JUnit4

Author: afranken

CHANGELOG.md

@@ -7,6 +7,7 @@ Whenever a 3rd party library is updated, S3Mock will update it's MINOR version.
 * [Changelog](#changelog)
 * [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
   * [Planned changes](#planned-changes)
+  * [5.0.0 - PLANNED](#500---planned)
 * [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
   * [4.6.0 - PLANNED](#460---planned)
   * [4.5.0](#450)
@@ -133,25 +134,23 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
     * Removal of properties workarounds
   * Migration to `Kotlin` - the IntegrationTests and unit tests were migrated already.
 * Version updates
-  * Bump Spring Boot version to 4.x
-  * Bump Spring Framework version to 7.x
-  * Bump java version from 17 to 25
-    * S3Mock will use the baseline Spring chooses to support.
-    * The Docker container will run Java 25 LTS.
+  * TBD
 
 ## 5.0.0 - PLANNED
 
 * Features and fixes
   * TBD
 * Refactorings
   * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
-    * Remove Java v1.
+    * Remove Java SDK v1.
   * JUnit 4.x deprecation
     * Remove JUnit 4.x support.
 * Version updates
   * Bump Spring Boot version to 4.x
   * Bump Spring Framework version to 7.x
   * Bump java version from 17 to 25
+    * S3Mock will use the baseline Spring chooses to support.
+    * The Docker container will run Java 25 LTS.
 
 # CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT
 Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.

README.md

@@ -2,7 +2,7 @@
 ![Maven Build](https://github.com/adobe/S3Mock/workflows/Maven%20Build/badge.svg)
 [![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg)](https://hub.docker.com/r/adobe/s3mock/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/adobe/s3mock)](https://hub.docker.com/r/adobe/s3mock)
-[![Java17](https://img.shields.io/badge/MADE%20with-Java17-RED.svg)](#Java)
+[![Java](https://img.shields.io/badge/MADE%20with-Java17-RED.svg)](#Java)
 [![Kotlin](https://img.shields.io/badge/MADE%20with-Kotlin-RED.svg)](#Kotlin)  
 [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7673/badge)](https://bestpractices.coreinfrastructure.org/projects/7673)
 [![OpenSSF Scorecard](https://img.shields.io/ossf-scorecard/github.com/adobe/S3Mock?label=openssf%20scorecard&style=flat)](https://api.securityscorecards.dev/projects/github.com/adobe/S3Mock)
@@ -29,7 +29,6 @@
         * [Expanded example](#expanded-example)
       * [Start using self-signed SSL certificate](#start-using-self-signed-ssl-certificate)
     * [S3Mock Java](#s3mock-java)
-      * [Start using the JUnit4 Rule](#start-using-the-junit4-rule)
       * [Start using the JUnit5 Extension](#start-using-the-junit5-extension)
       * [Start using the TestNG Listener](#start-using-the-testng-listener)
       * [Start programmatically](#start-programmatically)
@@ -52,7 +51,7 @@
 `S3Mock` is a lightweight server that implements parts of the [Amazon S3 API](https://docs.aws.amazon.com/AmazonS3/latest/API/Welcome.html).  
 It has been created to support local integration testing by reducing infrastructure dependencies.
 
-The `S3Mock` server can be started as a standalone *Docker* container, using *Testcontainers*, *JUnit4*, *JUnit5* and *TestNG* support, or programmatically.
+The `S3Mock` server can be started as a standalone *Docker* container, using *Testcontainers*, *JUnit5* and *TestNG* support, or programmatically.
 
 ## Changelog
 
@@ -476,21 +475,6 @@ _This is the opposite of what software engineers are trying to achieve when thor
 
 **See also [the Java section below](#Java)**
 
-#### Start using the JUnit4 Rule
-
-The example [`S3MockRuleTest`](testsupport/junit4/src/test/java/com/adobe/testing/s3mock/junit4/S3MockRuleTest.java) demonstrates the usage of the `S3MockRule`, which can be configured through a _builder_.
-
-To use the JUnit4 Rule, use the following Maven artifact in `test` scope:
-
-```xml
-<dependency>
- <groupId>com.adobe.testing</groupId>
- <artifactId>s3mock-junit4</artifactId>
- <version>...</version>
- <scope>test</scope>
-</dependency>
-```
-
 #### Start using the JUnit5 Extension
 
 The `S3MockExtension` can currently be used in two ways:

pom.xml

@@ -121,8 +121,6 @@
 
     <aws-v2.version>2.31.50</aws-v2.version>
 
-    <aws.version>1.12.785</aws.version>
-
     <aws-kotlin.version>1.4.91</aws-kotlin.version>
 
     <commons-codec.version>1.15</commons-codec.version>
@@ -196,16 +194,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.amazonaws</groupId>
-        <artifactId>aws-java-sdk-core</artifactId>
-        <version>${aws.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.amazonaws</groupId>
-        <artifactId>aws-java-sdk-s3</artifactId>
-        <version>${aws.version}</version>
-      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>

testsupport/common/pom.xml

@@ -31,10 +31,6 @@
   <name>S3Mock - Testsupport - Common</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.adobe.testing</groupId>
       <artifactId>s3mock</artifactId>

testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java

@@ -20,12 +20,6 @@
 import static software.amazon.awssdk.http.SdkHttpConfigurationOption.TRUST_ALL_CERTIFICATES;
 
 import com.adobe.testing.s3mock.S3MockApplication;
-import com.amazonaws.ClientConfiguration;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import java.net.Socket;
 import java.net.URI;
 import java.security.KeyManagementException;
@@ -37,9 +31,6 @@
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509ExtendedTrustManager;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -90,40 +81,6 @@ public S3Client createS3ClientV2() {
       .build();
   }
 
-  /**
-   * Creates an {@link AmazonS3} client instance that is configured to call the started S3Mock
-   * 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");
-  }
-
-  /**
-   * Creates an {@link AmazonS3} client instance that is configured to call the started S3Mock
-   * server using HTTPS for a given region.
-   *
-   * @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");
-
-    return AmazonS3ClientBuilder.standard()
-        .withCredentials(new AWSStaticCredentialsProvider(credentials))
-        .withClientConfiguration(
-            configureClientToIgnoreInvalidSslCertificates(new ClientConfiguration()))
-        .withEndpointConfiguration(getEndpointConfiguration(region))
-        .enablePathStyleAccess()
-        .build();
-  }
-
   public int getPort() {
     return s3MockFileStore.getPort();
   }
@@ -141,29 +98,6 @@ public void registerKMSKeyRef(final String keyRef) {
     s3MockFileStore.registerKMSKeyRef(keyRef);
   }
 
-  /**
-   * Adjusts the given client configuration to allow the communication with the mock server using
-   * HTTPS, although that one uses a self-signed SSL certificate.
-   *
-   * @param clientConfiguration The {@link ClientConfiguration} to adjust.
-   *
-   * @return The adjusted instance.
-   */
-  public ClientConfiguration configureClientToIgnoreInvalidSslCertificates(
-      final ClientConfiguration clientConfiguration) {
-
-    clientConfiguration.getApacheHttpClientConfig()
-        .withSslSocketFactory(new SSLConnectionSocketFactory(
-            createBlindlyTrustingSslContext(),
-            NoopHostnameVerifier.INSTANCE));
-
-    return clientConfiguration;
-  }
-
-  protected EndpointConfiguration getEndpointConfiguration(final String region) {
-    return new EndpointConfiguration(getServiceEndpoint(), region);
-  }
-
   /**
    * Returns endpoint URL for connecting to the mock server.
    * @return endpoint URL for connecting to the mock server.