From 9bb6d83855ae2e1c8dbe8389efc6acbc8c8d8925 Mon Sep 17 00:00:00 2001
From: texastony <5892063+texastony@users.noreply.github.com>
Date: Thu, 24 Oct 2024 15:59:29 -0700
Subject: [PATCH] try 2.20.162

---
 pom.xml                                            |  2 +-
 .../encryption/s3/S3AsyncEncryptionClient.java     | 12 ++++++------
 .../amazon/encryption/s3/S3EncryptionClient.java   | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2290618a..ae6b3689e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
     <maven.compiler.target>8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <aws.java.sdk.version>2.29.0</aws.java.sdk.version>
+    <aws.java.sdk.version>2.20.162</aws.java.sdk.version>
     <aws.java.crt.version>0.31.3</aws.java.crt.version>
     <com.amazonaws.version>1.12.777</com.amazonaws.version>
   </properties>
diff --git a/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java b/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java
index f44c57545..372243e9b 100644
--- a/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java
+++ b/src/main/java/software/amazon/encryption/s3/S3AsyncEncryptionClient.java
@@ -706,11 +706,11 @@ public Builder disableMultiRegionAccessPoints(Boolean disableMultiRegionAccessPo
             return this;
         }
 
-        @Override
-        public S3AsyncClientBuilder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
-            _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
-            return this;
-        }
+        // @Override
+        // public S3AsyncClientBuilder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
+        //     _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
+        //     return this;
+        // }
 
         /**
          * Forces this client to use path-style addressing for buckets.
@@ -791,7 +791,7 @@ public S3AsyncEncryptionClient build() {
                         .serviceConfiguration(_serviceConfiguration)
                         .accelerate(_accelerate)
                         .disableMultiRegionAccessPoints(_disableMultiRegionAccessPoints)
-                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .forcePathStyle(_forcePathStyle)
                         .useArnRegion(_useArnRegion)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)
diff --git a/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java b/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java
index 7f3f1f6be..c72dacc94 100644
--- a/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java
+++ b/src/main/java/software/amazon/encryption/s3/S3EncryptionClient.java
@@ -926,11 +926,11 @@ public Builder disableMultiRegionAccessPoints(Boolean disableMultiRegionAccessPo
          *
          * @param disableS3ExpressSessionAuth
          */
-        @Override
-        public Builder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
-            _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
-            return this;
-        }
+        // @Override
+        // public Builder disableS3ExpressSessionAuth(Boolean disableS3ExpressSessionAuth) {
+        //     _disableS3ExpressSessionAuth = disableS3ExpressSessionAuth;
+        //     return this;
+        // }
 
         /**
          * Forces this client to use path-style addressing for buckets.
@@ -1077,7 +1077,7 @@ public S3EncryptionClient build() {
                         .useArnRegion(_useArnRegion)
                         .httpClient(_httpClient)
                         .httpClientBuilder(_httpClientBuilder)
-                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)
                         .build();
             }
@@ -1097,7 +1097,7 @@ public S3EncryptionClient build() {
                         .useArnRegion(_useArnRegion)
                         .httpClient(_asyncHttpClient)
                         .httpClientBuilder(_asyncHttpClientBuilder)
-                        .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
+                        // .disableS3ExpressSessionAuth(_disableS3ExpressSessionAuth)
                         .crossRegionAccessEnabled(_crossRegionAccessEnabled)
                         // TODO: Add MPU stuff here too
                         .build();