This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch release-1.13
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.13 by this push:
new b80c8ef [FLINK-18182][kinesis] Updating to latest AWS SDK for Kinesis
connector
b80c8ef is described below
commit b80c8ef618e5d4db439402200270fcd881d2f5ab
Author: Danny Cranmer <[email protected]>
AuthorDate: Fri Jun 18 14:21:45 2021 +0100
[FLINK-18182][kinesis] Updating to latest AWS SDK for Kinesis connector
---
flink-connectors/flink-connector-kinesis/pom.xml | 46 ++++++-------
.../src/main/resources/META-INF/NOTICE | 77 +++++++++++-----------
.../awssdk/global/handlers/execution.interceptors | 1 +
pom.xml | 3 +
4 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml
b/flink-connectors/flink-connector-kinesis/pom.xml
index aa4460d..ee66cd4 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -33,11 +33,11 @@ under the License.
<artifactId>flink-connector-kinesis_${scala.binary.version}</artifactId>
<name>Flink : Connectors : Kinesis</name>
<properties>
- <aws.sdk.version>1.11.754</aws.sdk.version>
- <aws.sdkv2.version>2.13.52</aws.sdkv2.version>
+ <aws.sdk.version>1.12.7</aws.sdk.version>
+ <aws.sdkv2.version>2.16.86</aws.sdkv2.version>
<aws.kinesis-kcl.version>1.11.2</aws.kinesis-kcl.version>
<aws.kinesis-kpl.version>0.14.0</aws.kinesis-kpl.version>
-
<aws.dynamodbstreams-kinesis-adapter.version>1.5.0</aws.dynamodbstreams-kinesis-adapter.version>
+
<aws.dynamodbstreams-kinesis-adapter.version>1.5.3</aws.dynamodbstreams-kinesis-adapter.version>
<httpclient.version>4.5.9</httpclient.version>
<httpcore.version>4.4.11</httpcore.version>
<guava.version>29.0-jre</guava.version>
@@ -67,6 +67,26 @@ under the License.
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-kms</artifactId>
+ <version>${aws.sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-s3</artifactId>
+ <version>${aws.sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-dynamodb</artifactId>
+ <version>${aws.sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-cloudwatch</artifactId>
+ <version>${aws.sdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-producer</artifactId>
<version>${aws.kinesis-kpl.version}</version>
</dependency>
@@ -74,31 +94,11 @@ under the License.
<groupId>com.amazonaws</groupId>
<artifactId>amazon-kinesis-client</artifactId>
<version>${aws.kinesis-kcl.version}</version>
- <!--
- We're excluding the below from the KCL since
we'll only be using the
-
com.amazonaws.services.kinesis.clientlibrary.types.UserRecord class, which will
not need these dependencies.
- -->
- <exclusions>
- <exclusion>
- <groupId>com.amazonaws</groupId>
-
<artifactId>aws-java-sdk-cloudwatch</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>dynamodb-streams-kinesis-adapter</artifactId>
<version>${aws.dynamodbstreams-kinesis-adapter.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.amazonaws</groupId>
-
<artifactId>aws-java-sdk-cloudwatch</artifactId>
- </exclusion>
- <exclusion>
-
<groupId>com.fasterxml.jackson.core</groupId>
-
<artifactId>jackson-databind</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Other third-party dependencies -->
diff --git
a/flink-connectors/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
b/flink-connectors/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
index b358a00..5f3b8cc 100644
---
a/flink-connectors/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
+++
b/flink-connectors/flink-connector-kinesis/src/main/resources/META-INF/NOTICE
@@ -8,47 +8,48 @@ This project bundles the following dependencies under the
Apache Software Licens
- com.amazonaws:amazon-kinesis-client:1.11.2
- com.amazonaws:amazon-kinesis-producer:0.14.0
-- com.amazonaws:aws-java-sdk-core:1.11.754
-- com.amazonaws:aws-java-sdk-dynamodb:1.11.603
-- com.amazonaws:aws-java-sdk-kinesis:1.11.754
-- com.amazonaws:aws-java-sdk-kms:1.11.603
-- com.amazonaws:aws-java-sdk-s3:1.11.603
-- com.amazonaws:aws-java-sdk-sts:1.11.754
-- com.amazonaws:dynamodb-streams-kinesis-adapter:1.5.0
-- com.amazonaws:jmespath-java:1.11.754
+- com.amazonaws:aws-java-sdk-core:1.12.7
+- com.amazonaws:aws-java-sdk-dynamodb:1.12.7
+- com.amazonaws:aws-java-sdk-kinesis:1.12.7
+- com.amazonaws:aws-java-sdk-kms:1.12.7
+- com.amazonaws:aws-java-sdk-s3:1.12.7
+- com.amazonaws:aws-java-sdk-sts:1.12.7
+- com.amazonaws:dynamodb-streams-kinesis-adapter:1.5.3
+- com.amazonaws:jmespath-java:1.12.7
+- com.amazonaws:aws-java-sdk-cloudwatch:1.12.7
- org.apache.httpcomponents:httpclient:4.5.9
- org.apache.httpcomponents:httpcore:4.4.11
- software.amazon.ion:ion-java:1.0.2
-- software.amazon.awssdk:kinesis:2.13.52
-- software.amazon.awssdk:aws-cbor-protocol:2.13.52
-- software.amazon.awssdk:aws-json-protocol:2.13.52
-- software.amazon.awssdk:protocol-core:2.13.52
-- software.amazon.awssdk:profiles:2.13.52
-- software.amazon.awssdk:sdk-core:2.13.52
-- software.amazon.awssdk:auth:2.13.52
+- software.amazon.awssdk:kinesis:2.16.86
+- software.amazon.awssdk:aws-cbor-protocol:2.16.86
+- software.amazon.awssdk:aws-json-protocol:2.16.86
+- software.amazon.awssdk:protocol-core:2.16.86
+- software.amazon.awssdk:profiles:2.16.86
+- software.amazon.awssdk:sdk-core:2.16.86
+- software.amazon.awssdk:auth:2.16.86
- software.amazon.eventstream:eventstream:1.0.1
-- software.amazon.awssdk:http-client-spi:2.13.52
-- software.amazon.awssdk:regions:2.13.52
-- software.amazon.awssdk:annotations:2.13.52
-- software.amazon.awssdk:utils:2.13.52
-- software.amazon.awssdk:aws-core:2.13.52
-- software.amazon.awssdk:metrics-spi:2.13.52
-- software.amazon.awssdk:apache-client:2.13.52
-- software.amazon.awssdk:netty-nio-client:2.13.52
-- software.amazon.awssdk:sts:2.13.52
-- software.amazon.awssdk:aws-query-protocol:2.13.52
-- io.netty:netty-codec-http:4.1.46.Final
-- io.netty:netty-codec-http2:4.1.46.Final
-- io.netty:netty-codec:4.1.46.Final
-- io.netty:netty-transport:4.1.46.Final
-- io.netty:netty-resolver:4.1.46.Final
-- io.netty:netty-common:4.1.46.Final
-- io.netty:netty-buffer:4.1.46.Final
-- io.netty:netty-handler:4.1.46.Final
-- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.46.Final
-- io.netty:netty-transport-native-unix-common:4.1.46.Final
-- com.typesafe.netty:netty-reactive-streams-http:2.0.4
-- com.typesafe.netty:netty-reactive-streams:2.0.4
+- software.amazon.awssdk:http-client-spi:2.16.86
+- software.amazon.awssdk:regions:2.16.86
+- software.amazon.awssdk:annotations:2.16.86
+- software.amazon.awssdk:utils:2.16.86
+- software.amazon.awssdk:aws-core:2.16.86
+- software.amazon.awssdk:metrics-spi:2.16.86
+- software.amazon.awssdk:apache-client:2.16.86
+- software.amazon.awssdk:netty-nio-client:2.16.86
+- software.amazon.awssdk:sts:2.16.86
+- software.amazon.awssdk:aws-query-protocol:2.16.86
+- io.netty:netty-codec-http:4.1.63.Final
+- io.netty:netty-codec-http2:4.1.63.Final
+- io.netty:netty-codec:4.1.63.Final
+- io.netty:netty-transport:4.1.63.Final
+- io.netty:netty-resolver:4.1.63.Final
+- io.netty:netty-common:4.1.63.Final
+- io.netty:netty-buffer:4.1.63.Final
+- io.netty:netty-handler:4.1.63.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.63.Final
+- io.netty:netty-transport-native-unix-common:4.1.63.Final
+- com.typesafe.netty:netty-reactive-streams-http:2.0.5
+- com.typesafe.netty:netty-reactive-streams:2.0.5
This project bundles the following dependencies under the BSD license.
See bundled license files for details.
@@ -57,7 +58,7 @@ See bundled license files for details.
This project bundles the following dependencies under the Creative Commons
Zero license (https://creativecommons.org/publicdomain/zero/1.0/).
-- org.reactivestreams:reactive-streams:1.0.2
+- org.reactivestreams:reactive-streams:1.0.3
The Amazon Kinesis Producer Library includes http-parser, Copyright (c)
Joyent, Inc. and other Node contributors, libc++, Copyright (c) 2003-2014, LLVM
Project, and slf4j, Copyright (c) 2004-2013 QOS.ch, each of which is subject to
the terms and conditions of the MIT license that states as follows:
diff --git
a/flink-connectors/flink-connector-kinesis/src/main/resources/org/apache/flink/kinesis/shaded/software/amazon/awssdk/global/handlers/execution.interceptors
b/flink-connectors/flink-connector-kinesis/src/main/resources/org/apache/flink/kinesis/shaded/software/amazon/awssdk/global/handlers/execution.interceptors
new file mode 100644
index 0000000..c23d01a
--- /dev/null
+++
b/flink-connectors/flink-connector-kinesis/src/main/resources/org/apache/flink/kinesis/shaded/software/amazon/awssdk/global/handlers/execution.interceptors
@@ -0,0 +1 @@
+org.apache.flink.kinesis.shaded.software.amazon.awssdk.core.internal.interceptor.HttpChecksumRequiredInterceptor
diff --git a/pom.xml b/pom.xml
index 4159bf1..226abad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1554,6 +1554,9 @@ under the License.
<exclude>flink-python/lib/**</exclude>
<exclude>flink-python/dev/download/**</exclude>
<exclude>flink-python/docs/_build/**</exclude>
+
+ <!-- AWS SDK config that does
not support license headers -->
+
<exclude>**/awssdk/global/handlers/execution.interceptors</exclude>
</excludes>
</configuration>
</plugin>
