HIVE-29305 (addendum): Exclude AWS SDK v2 from hive-exec (#6398)

* HIVE-29305 (addendum): Exclude AWS SDK v2 from hive-exec

* Add a test dependency

* Move comment

* Upgrade AWS SDK v2

* Mark provided

Author: okumin

itests/test-docker/k8s/hive-metastore/deployment.yaml

@@ -40,7 +40,7 @@ spec:
         - |
           apt-get update
           apt-get install -y --no-install-recommends ca-certificates wget
-          wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.26.19/bundle-2.26.19.jar -P /tmp/ext-jars
+          wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.42.25/bundle-2.42.25.jar -P /tmp/ext-jars
         volumeMounts:
         - name: ext-jars
           mountPath: /tmp/ext-jars

itests/test-docker/k8s/hive/deployment.yaml

@@ -40,7 +40,7 @@ spec:
         - |
           apt-get update
           apt-get install -y --no-install-recommends ca-certificates wget
-          wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.26.19/bundle-2.26.19.jar -P /tmp/ext-jars
+          wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.42.25/bundle-2.42.25.jar -P /tmp/ext-jars
         volumeMounts:
         - name: ext-jars
           mountPath: /tmp/ext-jars

packaging/src/docker/README.md

@@ -342,7 +342,7 @@ exit
 **Disclaimer:**  
 Hadoop **3.4.1** requires **AWS SDK v2**.
 ```shell
-wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.26.19/bundle-2.26.19.jar -P jars/
+wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.42.25/bundle-2.42.25.jar -P jars/
 ```
 
 2. Set the following environment variables:

pom.xml

@@ -232,7 +232,8 @@
     <datasketches.version>2.0.0</datasketches.version>
     <spotbugs.version>4.8.6</spotbugs.version>
     <validation-api.version>1.1.0.Final</validation-api.version>
-    <aws-secretsmanager-caching.version>2.1.1</aws-secretsmanager-caching.version>
+    <aws-java-sdk.version>2.42.25</aws-java-sdk.version>
+    <aws-secretsmanager-caching.version>2.2.0</aws-secretsmanager-caching.version>
     <jansi.version>2.4.0</jansi.version>
     <!-- If upgrading, upgrade atlas as well in ql/pom.xml, which brings in some springframework dependencies transitively -->
     <spring.version>5.3.39</spring.version>
@@ -271,10 +272,26 @@
   <dependencyManagement>
     <dependencies>
       <!-- dependencies are always listed in sorted order by groupId, artifactId -->
+      <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>bundle</artifactId>
+        <version>${aws-java-sdk.version}</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>com.amazonaws.secretsmanager</groupId>
         <artifactId>aws-secretsmanager-caching-java</artifactId>
         <version>${aws-secretsmanager-caching.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-crt-client</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>secretsmanager</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>com.esotericsoftware.kryo</groupId>

ql/pom.xml

@@ -167,6 +167,11 @@
       <artifactId>hive-storage-api</artifactId>
     </dependency>
     <!-- inter-project -->
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>bundle</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.amazonaws.secretsmanager</groupId>
       <artifactId>aws-secretsmanager-caching-java</artifactId>

standalone-metastore/packaging/src/docker/README.md

@@ -138,7 +138,7 @@ change the `POSTGRES_LOCAL_PATH` to the path of the downloaded jar.
 **Disclaimer:**  
 Hadoop **3.4.1** requires **AWS SDK v2**.
 ```shell
-wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.26.19/bundle-2.26.19.jar -P jars/
+wget https://repo1.maven.org/maven2/software/amazon/awssdk/bundle/2.42.25/bundle-2.42.25.jar -P jars/
 ```
 
 2. Set the following environment variables:
@@ -168,4 +168,4 @@ Volumes:
 To stop/remove them all,
 ```shell
 docker compose down
-```
+```