update encryption client version to latest

Author: ahmarsuhail

hadoop-project/pom.xml

@@ -188,7 +188,7 @@
     <surefire.fork.timeout>900</surefire.fork.timeout>
     <aws-java-sdk.version>1.12.599</aws-java-sdk.version>
     <aws-java-sdk-v2.version>2.23.19</aws-java-sdk-v2.version>
-    <amazon-s3-encryption-client-java.version>3.1.0</amazon-s3-encryption-client-java.version>
+    <amazon-s3-encryption-client-java.version>3.1.1</amazon-s3-encryption-client-java.version>
     <aws.eventstream.version>1.0.1</aws.eventstream.version>
     <hsqldb.version>2.7.1</hsqldb.version>
     <frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

@@ -146,17 +146,11 @@ public S3AsyncClient createS3AsyncClient(
         .thresholdInBytes(parameters.getMultiPartThreshold())
         .build();
 
-    S3AsyncClientBuilder s3AsyncClientBuilder =
-        configureClientBuilder(S3AsyncClient.builder(), parameters, conf, bucket).httpClientBuilder(
-            httpClientBuilder);
-
-    if (!parameters.isClientSideEncryptionEnabled()) {
-      s3AsyncClientBuilder
-          .multipartConfiguration(multipartConfiguration)
-          .multipartEnabled(parameters.isMultipartCopy());
-    }
-
-    return s3AsyncClientBuilder.build();
+    return configureClientBuilder(S3AsyncClient.builder(), parameters, conf, bucket)
+        .httpClientBuilder(httpClientBuilder)
+        .multipartConfiguration(multipartConfiguration)
+        .multipartEnabled(parameters.isMultipartCopy())
+        .build();
   }
 
   @Override