This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to annotated tag release-3.3.6-RC0
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit 028a2d69bdd2e5937801bd4778628dd936e9b484
Author: Viraj Jasani <vjas...@apache.org>
AuthorDate: Mon Jun 12 16:29:59 2023 -0700
HADOOP-18763. Upgrade aws-java-sdk to 1.12.367
(cherry picked from commit 9c74550508b5bbd325c79ace3b4b0d2152327e22)
Conflicts:
LICENSE-binary
---
LICENSE-binary | 2 +-
hadoop-project/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 112ee1d548d..834eeb2625b 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -214,7 +214,7 @@ com.aliyun:aliyun-java-sdk-kms:2.11.0
com.aliyun:aliyun-java-sdk-ram:3.1.0
com.aliyun:aliyun-java-sdk-sts:3.0.0
com.aliyun.oss:aliyun-sdk-oss:3.13.0
-com.amazonaws:aws-java-sdk-bundle:1.12.316
+com.amazonaws:aws-java-sdk-bundle:1.12.367
com.cedarsoftware:java-util:1.9.0
com.cedarsoftware:json-io:2.5.1
com.fasterxml.jackson.core:jackson-annotations:2.12.7
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index e45b8c51ce9..f1ac43ed5b3 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -186,7 +186,7 @@
<exec-maven-plugin.version>1.3.1</exec-maven-plugin.version>
<make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version>
<surefire.fork.timeout>900</surefire.fork.timeout>
- <aws-java-sdk.version>1.12.316</aws-java-sdk.version>
+ <aws-java-sdk.version>1.12.367</aws-java-sdk.version>
<hsqldb.version>2.7.1</hsqldb.version>
<frontend-maven-plugin.version>1.11.2</frontend-maven-plugin.version>
<jasmine-maven-plugin.version>2.1</jasmine-maven-plugin.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
