Upgrade to AWS SDK v2

.gitignore

@@ -1,2 +1,3 @@
 target/
-.idea/
+.idea/
+*.iml

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.amazonaws</groupId>
   <artifactId>amazon-sqs-java-extended-client-lib</artifactId>
-  <version>1.2.2</version>
+  <version>2.0.0</version>
   <packaging>jar</packaging>
   <name>Amazon SQS Extended Client Library for Java</name>
   <description>An extension to the Amazon SQS client that enables sending and receiving messages up to 2GB via Amazon S3.
@@ -37,25 +37,32 @@
   </developers>
 
   <properties>
-    <aws-java-sdk.version>1.11.300</aws-java-sdk.version>
+    <aws-java-sdk.version>2.14.19</aws-java-sdk.version>
   </properties>
 
   <dependencies>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-sqs</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>sqs</artifactId>
       <version>${aws-java-sdk.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>s3</artifactId>
       <version>${aws-java-sdk.version}</version>
     </dependency>
 
     <dependency>
       <groupId>software.amazon.payloadoffloading</groupId>
       <artifactId>payloadoffloading-common</artifactId>
-      <version>1.1.0</version>
+      <version>2.1.2</version>
+    </dependency>
+
+    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
     </dependency>
 
     <dependency>
@@ -67,7 +74,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>1.10.19</version>
+      <version>3.12.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/amazon/sqs/javamessaging/ExtendedClientConfiguration.java

@@ -15,11 +15,11 @@
 
 package com.amazon.sqs.javamessaging;
 
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.model.CannedAccessControlList;
-import com.amazonaws.services.s3.model.SSEAwsKeyManagementParams;
-import com.amazonaws.annotation.NotThreadSafe;
+import software.amazon.awssdk.annotations.NotThreadSafe;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
 import software.amazon.payloadoffloading.PayloadStorageConfiguration;
+import software.amazon.payloadoffloading.ServerSideEncryptionStrategy;
 
 
 /**
@@ -61,7 +61,7 @@ public ExtendedClientConfiguration(ExtendedClientConfiguration other) {
      *            objects its the responsibility to the message producer to handle
      *            the clean up appropriately.
      */
-    public void setPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean cleanupS3Payload) {
+    public void setPayloadSupportEnabled(S3Client s3, String s3BucketName, boolean cleanupS3Payload) {
         setPayloadSupportEnabled(s3, s3BucketName);
         this.cleanupS3Payload = cleanupS3Payload;
     }
@@ -82,7 +82,7 @@ public void setPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean c
      *            objects its the responsibility to the message producer to handle
      *            the clean up appropriately.
      */
-    public ExtendedClientConfiguration withPayloadSupportEnabled(AmazonS3 s3, String s3BucketName, boolean cleanupS3Payload) {
+    public ExtendedClientConfiguration withPayloadSupportEnabled(S3Client s3, String s3BucketName, boolean cleanupS3Payload) {
         setPayloadSupportEnabled(s3, s3BucketName, cleanupS3Payload);
         return this;
     }
@@ -167,14 +167,14 @@ public ExtendedClientConfiguration withAlwaysThroughS3(boolean alwaysThroughS3)
     }
 
     @Override
-    public ExtendedClientConfiguration withPayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
+    public ExtendedClientConfiguration withPayloadSupportEnabled(S3Client s3, String s3BucketName) {
         this.setPayloadSupportEnabled(s3, s3BucketName);
         return this;
     }
 
     @Override
-    public ExtendedClientConfiguration withSSEAwsKeyManagementParams(SSEAwsKeyManagementParams sseAwsKeyManagementParams) {
-        this.setSSEAwsKeyManagementParams(sseAwsKeyManagementParams);
+    public ExtendedClientConfiguration withObjectCannedACL(ObjectCannedACL objectCannedACL) {
+        this.setObjectCannedACL(objectCannedACL);
         return this;
     }
 
@@ -191,8 +191,8 @@ public ExtendedClientConfiguration withPayloadSupportDisabled() {
     }
 
     @Override
-    public ExtendedClientConfiguration withCannedAccessControlList(CannedAccessControlList cannedAccessControlList) {
-        this.setCannedAccessControlList(cannedAccessControlList);
+    public ExtendedClientConfiguration withServerSideEncryption(ServerSideEncryptionStrategy serverSideEncryption) {
+        this.setServerSideEncryptionStrategy(serverSideEncryption);
         return this;
     }
 
@@ -207,10 +207,10 @@ public ExtendedClientConfiguration withCannedAccessControlList(CannedAccessContr
      *            large-payload messages. The bucket must be already created and
      *            configured in s3.
      *
-     * @deprecated Instead use {@link #setPayloadSupportEnabled(AmazonS3, String, boolean)}
+     * @deprecated Instead use {@link #setPayloadSupportEnabled(S3Client, String, boolean)}
      */
     @Deprecated
-    public void setLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
+    public void setLargePayloadSupportEnabled(S3Client s3, String s3BucketName) {
         this.setPayloadSupportEnabled(s3, s3BucketName);
     }
 
@@ -226,10 +226,10 @@ public void setLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
      *            configured in s3.
      * @return the updated ExtendedClientConfiguration object.
      *
-     * @deprecated Instead use {@link #withPayloadSupportEnabled(AmazonS3, String)}
+     * @deprecated Instead use {@link #withPayloadSupportEnabled(S3Client, String)}
      */
     @Deprecated
-    public ExtendedClientConfiguration withLargePayloadSupportEnabled(AmazonS3 s3, String s3BucketName) {
+    public ExtendedClientConfiguration withLargePayloadSupportEnabled(S3Client s3, String s3BucketName) {
         setLargePayloadSupportEnabled(s3, s3BucketName);
         return this;
     }