[FLINK-14881][s3] Bump aws-sdk-version to 1.11.754, httpclient to 4.5…

….9 and add aws-java-sdk-sts dependency to support WebIdentityToken
derekm · May 14, 2020 · dd5d007 · dd5d007
1 parent 96b86fc
commit dd5d007
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/flink-filesystems/flink-s3-fs-base/pom.xml b/flink-filesystems/flink-s3-fs-base/pom.xml
@@ -33,7 +33,7 @@ under the License.
  <packaging>jar</packaging>
 
  <properties>
- <fs.s3.aws.version>1.11.271</fs.s3.aws.version>
+ <fs.s3.aws.version>1.11.754</fs.s3.aws.version>
  </properties>
 
  <dependencies>
@@ -204,6 +204,11 @@ under the License.
  <artifactId>aws-java-sdk-dynamodb</artifactId>
  <version>${fs.s3.aws.version}</version>
  </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-sts</artifactId>
+ <version>${fs.s3.aws.version}</version>
+ </dependency>
 
  <!-- Hadoop's s3 support classes (bundled) -->
  <dependency>

diff --git a/flink-filesystems/flink-s3-fs-hadoop/pom.xml b/flink-filesystems/flink-s3-fs-hadoop/pom.xml
@@ -87,6 +87,17 @@ under the License.
  </dependency>
  </dependencies>
 
+ <dependencyManagement>
+ <dependencies>
+ <!-- aws-sdk requires httpclient >= 4.5.9 due to api compatibility breakage -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.9</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
  <build>
  <plugins>
  <plugin>

diff --git a/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-hadoop/src/main/resources/META-INF/NOTICE
@@ -3,11 +3,11 @@ Copyright 2014-2020 The Apache Software Foundation
 
 This project bundles the following dependencies under the Apache Software License 2.0 (http:https://www.apache.org/licenses/LICENSE-2.0.txt)
 
-- com.amazonaws:aws-java-sdk-core:1.11.271
-- com.amazonaws:aws-java-sdk-dynamodb:1.11.271
-- com.amazonaws:aws-java-sdk-kms:1.11.271
-- com.amazonaws:aws-java-sdk-s3:1.11.271
-- com.amazonaws:jmespath-java:1.11.271
+- com.amazonaws:aws-java-sdk-core:1.11.754
+- com.amazonaws:aws-java-sdk-dynamodb:1.11.754
+- com.amazonaws:aws-java-sdk-kms:1.11.754
+- com.amazonaws:aws-java-sdk-s3:1.11.754
+- com.amazonaws:jmespath-java:1.11.754
 - com.fasterxml.jackson.core:jackson-annotations:2.10.1
 - com.fasterxml.jackson.core:jackson-core:2.10.1
 - com.fasterxml.jackson.core:jackson-databind:2.10.1
@@ -29,7 +29,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.hadoop:hadoop-common:3.1.0
 - org.apache.htrace:htrace-core4:4.1.0-incubating
 - org.apache.httpcomponents:httpcore:4.4.6
-- org.apache.httpcomponents:httpclient:4.5.3
+- org.apache.httpcomponents:httpclient:4.5.9
 - software.amazon.ion:ion-java:1.0.2
 
 This project bundles the following dependencies under the CDDL 1.1 license.

diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml
@@ -213,6 +213,18 @@ under the License.
  </dependency>
  </dependencies>
 
+ <dependencyManagement>
+ <dependencies>
+ <!-- aws-sdk requires httpclient >= 4.5.9 due to api compatibility breakage -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.9</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+
  <build>
  <plugins>
  <plugin>

diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE
@@ -12,11 +12,11 @@ This project bundles the following dependencies under the Apache Software Licens
 - commons-io:commons-io:2.4
 - commons-lang:commons-lang:2.6
 - commons-logging:commons-logging:1.1.3
-- com.amazonaws:aws-java-sdk-core:1.11.271
-- com.amazonaws:aws-java-sdk-dynamodb:1.11.271
-- com.amazonaws:aws-java-sdk-kms:1.11.271
-- com.amazonaws:aws-java-sdk-s3:1.11.271
-- com.amazonaws:jmespath-java:1.11.271
+- com.amazonaws:aws-java-sdk-core:1.11.754
+- com.amazonaws:aws-java-sdk-dynamodb:1.11.754
+- com.amazonaws:aws-java-sdk-kms:1.11.754
+- com.amazonaws:aws-java-sdk-s3:1.11.754
+- com.amazonaws:jmespath-java:1.11.754
 - com.facebook.presto:presto-hive:0.187
 - com.facebook.presto.hadoop:hadoop-apache2:2.7.3-1
 - com.fasterxml.jackson.core:jackson-annotations:2.10.1
@@ -39,7 +39,7 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.hadoop:hadoop-common:3.1.0
 - org.apache.htrace:htrace-core4:4.1.0-incubating
 - org.apache.httpcomponents:httpcore:4.4.6
-- org.apache.httpcomponents:httpclient:4.5.3
+- org.apache.httpcomponents:httpclient:4.5.9
 - org.weakref:jmxutils:1.19
 - software.amazon.ion:ion-java:1.0.2