This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch release-1.14
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 0e19d8eded511558d7f7653dc371cbea6e9472b0
Author: Danny Cranmer <dannycran...@apache.org>
AuthorDate: Tue Aug 9 17:20:06 2022 +0100
[FLINK-28094][kinesis][glue] Updating AWS SDK versions for Kinesis
connectors and Glue Schema Registry formats
---
flink-connectors/flink-connector-kinesis/pom.xml | 44 +++----
.../src/main/resources/META-INF/NOTICE | 76 ++++++------
.../flink-glue-schema-registry-test/pom.xml | 133 +++++++++------------
.../flink-avro-glue-schema-registry/pom.xml | 110 +++++------------
4 files changed, 146 insertions(+), 217 deletions(-)
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml
b/flink-connectors/flink-connector-kinesis/pom.xml
index c88f9a4aca1..6bde75dbf14 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -33,9 +33,9 @@ under the License.
<artifactId>flink-connector-kinesis_${scala.binary.version}</artifactId>
<name>Flink : Connectors : Kinesis</name>
<properties>
- <aws.sdk.version>1.12.7</aws.sdk.version>
- <aws.sdkv2.version>2.16.86</aws.sdkv2.version>
- <aws.kinesis-kcl.version>1.14.1</aws.kinesis-kcl.version>
+ <aws.sdk.version>1.12.276</aws.sdk.version>
+ <aws.sdkv2.version>2.17.247</aws.sdkv2.version>
+ <aws.kinesis-kcl.version>1.14.8</aws.kinesis-kcl.version>
<aws.kinesis-kpl.version>0.14.1</aws.kinesis-kpl.version>
<aws.dynamodbstreams-kinesis-adapter.version>1.5.3</aws.dynamodbstreams-kinesis-adapter.version>
<httpclient.version>4.5.13</httpclient.version>
@@ -45,6 +45,25 @@ under the License.
<packaging>jar</packaging>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-bom</artifactId>
+ <version>${aws.sdk.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>software.amazon.awssdk</groupId>
+ <artifactId>bom</artifactId>
+ <version>${aws.sdkv2.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<!-- AWS dependencies -->
<dependency>
@@ -58,32 +77,26 @@ under the License.
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kinesis</artifactId>
- <version>${aws.sdk.version}</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
- <version>${aws.sdk.version}</version>
</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>
@@ -94,16 +107,6 @@ 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>
@@ -212,19 +215,16 @@ under the License.
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>kinesis</artifactId>
- <version>${aws.sdkv2.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>netty-nio-client</artifactId>
- <version>${aws.sdkv2.version}</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
- <version>${aws.sdkv2.version}</version>
</dependency>
<dependency>
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 9439639c177..b79ca202a7b 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
@@ -6,48 +6,52 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software
License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- com.amazonaws:amazon-kinesis-client:1.14.1
+- com.amazonaws:amazon-kinesis-client:1.14.8
- com.amazonaws:amazon-kinesis-producer:0.14.1
-- 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:aws-java-sdk-cloudwatch:1.12.7
+- com.amazonaws:aws-java-sdk-core:1.12.276
+- com.amazonaws:aws-java-sdk-dynamodb:1.12.276
+- com.amazonaws:aws-java-sdk-kinesis:1.12.276
+- com.amazonaws:aws-java-sdk-kms:1.12.276
+- com.amazonaws:aws-java-sdk-s3:1.12.276
+- com.amazonaws:aws-java-sdk-sts:1.12.276
+- com.amazonaws:aws-java-sdk-cloudwatch:1.12.276
- com.amazonaws:dynamodb-streams-kinesis-adapter:1.5.3
-- com.amazonaws:jmespath-java:1.12.7
+- com.amazonaws:jmespath-java:1.12.276
- org.apache.httpcomponents:httpclient:4.5.13
- org.apache.httpcomponents:httpcore:4.4.14
- software.amazon.ion:ion-java:1.0.2
-- 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.awssdk:kinesis:2.17.247
+- software.amazon.awssdk:aws-cbor-protocol:2.17.247
+- software.amazon.awssdk:aws-json-protocol:2.17.247
+- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.17.247
+- software.amazon.awssdk:third-party-jackson-core:2.17.247
+- software.amazon.awssdk:protocol-core:2.17.247
+- software.amazon.awssdk:profiles:2.17.247
+- software.amazon.awssdk:sdk-core:2.17.247
+- software.amazon.awssdk:auth:2.17.247
- software.amazon.eventstream:eventstream:1.0.1
-- 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
+- software.amazon.awssdk:http-client-spi:2.17.247
+- software.amazon.awssdk:regions:2.17.247
+- software.amazon.awssdk:annotations:2.17.247
+- software.amazon.awssdk:utils:2.17.247
+- software.amazon.awssdk:json-utils:2.17.247
+- software.amazon.awssdk:aws-core:2.17.247
+- software.amazon.awssdk:metrics-spi:2.17.247
+- software.amazon.awssdk:apache-client:2.17.247
+- software.amazon.awssdk:netty-nio-client:2.17.247
+- software.amazon.awssdk:sts:2.17.247
+- software.amazon.awssdk:aws-query-protocol:2.17.247
+- io.netty:netty-codec-http:4.1.77.Final
+- io.netty:netty-codec-http2:4.1.77.Final
+- io.netty:netty-codec:4.1.77.Final
+- io.netty:netty-transport:4.1.77.Final
+- io.netty:netty-resolver:4.1.77.Final
+- io.netty:netty-common:4.1.77.Final
+- io.netty:netty-buffer:4.1.77.Final
+- io.netty:netty-handler:4.1.77.Final
+- io.netty:netty-transport-classes-epoll:4.1.77.Final
+- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.77.Final
+- io.netty:netty-transport-native-unix-common:4.1.77.Final
- com.typesafe.netty:netty-reactive-streams-http:2.0.5
- com.typesafe.netty:netty-reactive-streams:2.0.5
- commons-logging:commons-logging:1.1.3
diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-test/pom.xml
b/flink-end-to-end-tests/flink-glue-schema-registry-test/pom.xml
index 4ce19370b0a..d1c715ff40a 100644
--- a/flink-end-to-end-tests/flink-glue-schema-registry-test/pom.xml
+++ b/flink-end-to-end-tests/flink-glue-schema-registry-test/pom.xml
@@ -33,118 +33,99 @@ under the License.
<packaging>jar</packaging>
<properties>
- <aws.sdk.version>1.12.7</aws.sdk.version>
- <aws.sdkv2.version>2.16.86</aws.sdkv2.version>
- <reactivestreams.version>1.0.2</reactivestreams.version>
- <netty.version>4.1.63.Final</netty.version>
- <guava.version>29.0-jre</guava.version>
+ <aws.sdk.version>1.12.276</aws.sdk.version>
+ <aws.sdkv2.version>2.17.247</aws.sdkv2.version>
+ <kotlin.version>1.3.50</kotlin.version>
</properties>
- <!-- ============================= -->
- <!-- DEPENDENCY MANAGEMENT -->
- <!-- ============================= -->
<dependencyManagement>
<dependencies>
- <!-- dependencies to solve enforcer check issue -->
- <!-- can be removed once new version of Glue Schema
Registry releases -->
-
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>http-client-spi</artifactId>
+ <artifactId>bom</artifactId>
<version>${aws.sdkv2.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>aws-core</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-bom</artifactId>
+ <version>${aws.sdk.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
+ <!-- For dependency convergence -->
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>protocol-core</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>3.19.4</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>annotations</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>29.0-jre</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>utils</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-reflect</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>org.reactivestreams</groupId>
- <artifactId>reactive-streams</artifactId>
- <version>${reactivestreams.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>aws-json-protocol</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jdk8</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>regions</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlinx</groupId>
+
<artifactId>kotlinx-serialization-core-jvm</artifactId>
+ <version>1.0.1</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>sdk-core</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>3.5.0</version>
</dependency>
-
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>${netty.version}</version>
+ <groupId>com.squareup.okio</groupId>
+ <artifactId>okio</artifactId>
+ <version>2.8.0</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>netty-nio-client</artifactId>
- <version>${aws.sdkv2.version}</version>
- <scope>runtime</scope>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>17.0.0</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>auth</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-api</artifactId>
+ <version>3.2.13</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>metrics-spi</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.github.docker-java</groupId>
+
<artifactId>docker-java-transport-zerodep</artifactId>
+ <version>3.2.13</version>
</dependency>
-
<dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
+ <groupId>com.github.docker-java</groupId>
+ <artifactId>docker-java-transport</artifactId>
+ <version>3.2.13</version>
</dependency>
-
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>amazon-kinesis-client</artifactId>
+ <version>1.14.7</version>
</dependency>
-
</dependencies>
</dependencyManagement>
@@ -193,15 +174,9 @@ under the License.
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>sdk-core</artifactId>
- <version>${aws.sdkv2.version}</version>
- </dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-kinesis</artifactId>
- <version>${aws.sdk.version}</version>
</dependency>
</dependencies>
diff --git a/flink-formats/flink-avro-glue-schema-registry/pom.xml
b/flink-formats/flink-avro-glue-schema-registry/pom.xml
index 4f8382f5b89..f90efb4f0c0 100644
--- a/flink-formats/flink-avro-glue-schema-registry/pom.xml
+++ b/flink-formats/flink-avro-glue-schema-registry/pom.xml
@@ -34,111 +34,61 @@ under the License.
<properties>
<glue.schema.registry.version>1.0.1</glue.schema.registry.version>
- <aws.sdkv2.version>2.16.86</aws.sdkv2.version>
- <reactivestreams.version>1.0.2</reactivestreams.version>
- <netty.version>4.1.63.Final</netty.version>
+ <aws.sdkv2.version>2.17.247</aws.sdkv2.version>
+ <kotlin.version>1.3.50</kotlin.version>
</properties>
- <!-- ============================= -->
- <!-- DEPENDENCY MANAGEMENT -->
- <!-- ============================= -->
<dependencyManagement>
<dependencies>
- <!-- dependencies to solve enforcer check issue -->
- <!-- can be removed once new version of Glue Schema
Registry releases -->
-
<dependency>
<groupId>software.amazon.awssdk</groupId>
- <artifactId>http-client-spi</artifactId>
+ <artifactId>bom</artifactId>
<version>${aws.sdkv2.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
+ <!-- For dependency convergence -->
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>aws-core</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>3.19.4</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>protocol-core</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>29.0-jre</version>
</dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>annotations</artifactId>
- <version>${aws.sdkv2.version}</version>
- </dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>utils</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-reflect</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
- <version>${aws.sdkv2.version}</version>
- <scope>test</scope>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>org.reactivestreams</groupId>
- <artifactId>reactive-streams</artifactId>
- <version>${reactivestreams.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-common</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>aws-json-protocol</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-stdlib-jdk8</artifactId>
+ <version>${kotlin.version}</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>regions</artifactId>
- <version>${aws.sdkv2.version}</version>
+ <groupId>org.jetbrains.kotlinx</groupId>
+
<artifactId>kotlinx-serialization-core-jvm</artifactId>
+ <version>1.0.1</version>
</dependency>
-
<dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>sdk-core</artifactId>
- <version>${aws.sdkv2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-codec-http</artifactId>
- <version>${netty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>netty-nio-client</artifactId>
- <version>${aws.sdkv2.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>auth</artifactId>
- <version>${aws.sdkv2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>metrics-spi</artifactId>
- <version>${aws.sdkv2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>17.0.0</version>
</dependency>
-
</dependencies>
</dependencyManagement>
