From 8b99970d41205637f7247ba52c38f43a76ae5d91 Mon Sep 17 00:00:00 2001 From: okumin Date: Mon, 30 Mar 2026 18:28:39 +0900 Subject: [PATCH 1/5] HIVE-29305 (addendum): Exclude AWS SDK v2 from hive-exec --- pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0ea93db9413f..ce40ee63f8fa 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ 2.0.0 4.8.6 1.1.0.Final - 2.1.1 + 2.2.0 2.4.0 5.3.39 @@ -275,6 +275,16 @@ com.amazonaws.secretsmanager aws-secretsmanager-caching-java ${aws-secretsmanager-caching.version} + + + software.amazon.awssdk + aws-crt-client + + + software.amazon.awssdk + secretsmanager + + com.esotericsoftware.kryo From 5c4e1ab9cbd81b723e7689009e9bb55176e2db6b Mon Sep 17 00:00:00 2001 From: okumin Date: Mon, 30 Mar 2026 18:47:19 +0900 Subject: [PATCH 2/5] Add a test dependency --- pom.xml | 6 ++++++ ql/pom.xml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index ce40ee63f8fa..ad2899d26f3e 100644 --- a/pom.xml +++ b/pom.xml @@ -232,6 +232,7 @@ 2.0.0 4.8.6 1.1.0.Final + 2.26.19 2.2.0 2.4.0 @@ -271,6 +272,11 @@ + + software.amazon.awssdk + bundle + ${aws-java-sdk.version} + com.amazonaws.secretsmanager aws-secretsmanager-caching-java diff --git a/ql/pom.xml b/ql/pom.xml index 994dbacf4e84..92d44cb6d222 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -166,6 +166,11 @@ org.apache.hive hive-storage-api + + software.amazon.awssdk + bundle + test + com.amazonaws.secretsmanager From e4f86c9a6bffec10cab1b3ee28bbe03531ac8da4 Mon Sep 17 00:00:00 2001 From: okumin Date: Thu, 2 Apr 2026 08:48:43 +0900 Subject: [PATCH 3/5] Move comment --- ql/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ql/pom.xml b/ql/pom.xml index 92d44cb6d222..5b296afad745 100644 --- a/ql/pom.xml +++ b/ql/pom.xml @@ -166,12 +166,12 @@ org.apache.hive hive-storage-api + software.amazon.awssdk bundle test - com.amazonaws.secretsmanager aws-secretsmanager-caching-java From 72ff3f7794244dcff2a37ce3e734b298e81ddbdf Mon Sep 17 00:00:00 2001 From: okumin Date: Thu, 2 Apr 2026 20:11:54 +0900 Subject: [PATCH 4/5] Upgrade AWS SDK v2 --- itests/test-docker/k8s/hive-metastore/deployment.yaml | 2 +- itests/test-docker/k8s/hive/deployment.yaml | 2 +- packaging/src/docker/README.md | 2 +- pom.xml | 2 +- standalone-metastore/packaging/src/docker/README.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/itests/test-docker/k8s/hive-metastore/deployment.yaml b/itests/test-docker/k8s/hive-metastore/deployment.yaml index cee75d06e0ec..1282b259cb40 100644 --- a/itests/test-docker/k8s/hive-metastore/deployment.yaml +++ b/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 diff --git a/itests/test-docker/k8s/hive/deployment.yaml b/itests/test-docker/k8s/hive/deployment.yaml index 81fb105233f3..0b594b6334da 100644 --- a/itests/test-docker/k8s/hive/deployment.yaml +++ b/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 diff --git a/packaging/src/docker/README.md b/packaging/src/docker/README.md index 9e2d37c57fec..046dc1f5d801 100644 --- a/packaging/src/docker/README.md +++ b/packaging/src/docker/README.md @@ -314,7 +314,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: diff --git a/pom.xml b/pom.xml index ad2899d26f3e..fa471ef24f36 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ 2.0.0 4.8.6 1.1.0.Final - 2.26.19 + 2.42.25 2.2.0 2.4.0 diff --git a/standalone-metastore/packaging/src/docker/README.md b/standalone-metastore/packaging/src/docker/README.md index e4be92f49307..7c786aadcb58 100644 --- a/standalone-metastore/packaging/src/docker/README.md +++ b/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 -``` \ No newline at end of file +``` From 1054a193e0411bd0defdce8e4fa755416109fc2c Mon Sep 17 00:00:00 2001 From: okumin Date: Thu, 2 Apr 2026 21:32:09 +0900 Subject: [PATCH 5/5] Mark provided --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index fa471ef24f36..9d88dcdf8a11 100644 --- a/pom.xml +++ b/pom.xml @@ -276,6 +276,7 @@ software.amazon.awssdk bundle ${aws-java-sdk.version} + provided com.amazonaws.secretsmanager