This is an automated email from the ASF dual-hosted git repository. dannycranmer pushed a commit to branch release-1.15 in repository https://gitbox.apache.org/repos/asf/flink.git
commit c124872de681ef3f0ea5e7431bb4d33368228f86 Author: Danny Cranmer <[email protected]> AuthorDate: Sat Aug 6 02:15:06 2022 +0100 [FLINK-28094][kinesis][glue] Updating AWS SDK versions for Kinesis connectors and Glue Schema Registry formats --- flink-connectors/flink-connector-aws-base/pom.xml | 18 ++-- .../connector/aws/util/AWSAsyncSinkUtilTest.java | 15 ++++ .../flink-connector-aws-kinesis-firehose/pom.xml | 22 +++-- .../flink-connector-aws-kinesis-streams/pom.xml | 21 +++-- flink-connectors/flink-connector-kinesis/pom.xml | 44 +++++----- .../src/main/resources/META-INF/NOTICE | 58 ++++++------- .../util/JobManagerWatermarkTrackerTest.java | 6 +- .../src/main/resources/META-INF/NOTICE | 36 ++++---- .../src/main/resources/META-INF/NOTICE | 41 +++++---- .../pom.xml | 22 +++-- .../flink-glue-schema-registry-avro-test/pom.xml | 97 ++++++++++++++++------ .../flink-glue-schema-registry-json-test/pom.xml | 81 +++++++++++------- .../flink-avro-glue-schema-registry/pom.xml | 62 ++++++++++---- .../flink-json-glue-schema-registry/pom.xml | 74 ++++++++++------- 14 files changed, 374 insertions(+), 223 deletions(-) diff --git a/flink-connectors/flink-connector-aws-base/pom.xml b/flink-connectors/flink-connector-aws-base/pom.xml index 431cbaca5e6..065599ecb6b 100644 --- a/flink-connectors/flink-connector-aws-base/pom.xml +++ b/flink-connectors/flink-connector-aws-base/pom.xml @@ -33,11 +33,23 @@ under the License. <artifactId>flink-connector-aws-base</artifactId> <name>Flink : Connectors : AWS Base</name> <properties> - <aws.sdk.version>2.17.52</aws.sdk.version> + <aws.sdk.version>2.17.247</aws.sdk.version> </properties> <packaging>jar</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdk.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.flink</groupId> @@ -55,13 +67,11 @@ under the License. <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>netty-nio-client</artifactId> - <version>${aws.sdk.version}</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>sts</artifactId> - <version>${aws.sdk.version}</version> </dependency> <!-- Test dependencies --> @@ -74,14 +84,12 @@ under the License. <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>s3</artifactId> - <version>${aws.sdk.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>iam</artifactId> - <version>${aws.sdk.version}</version> <scope>test</scope> </dependency> diff --git a/flink-connectors/flink-connector-aws-base/src/test/java/org/apache/flink/connector/aws/util/AWSAsyncSinkUtilTest.java b/flink-connectors/flink-connector-aws-base/src/test/java/org/apache/flink/connector/aws/util/AWSAsyncSinkUtilTest.java index ccecdb8c3f2..8ae92457312 100644 --- a/flink-connectors/flink-connector-aws-base/src/test/java/org/apache/flink/connector/aws/util/AWSAsyncSinkUtilTest.java +++ b/flink-connectors/flink-connector-aws-base/src/test/java/org/apache/flink/connector/aws/util/AWSAsyncSinkUtilTest.java @@ -219,12 +219,27 @@ public class AWSAsyncSinkUtilTest { return null; } + @Override + public MockAsyncClientBuilder dualstackEnabled(Boolean aBoolean) { + return null; + } + + @Override + public MockAsyncClientBuilder fipsEnabled(Boolean aBoolean) { + return null; + } + @Override public MockAsyncClientBuilder overrideConfiguration( ClientOverrideConfiguration clientOverrideConfiguration) { return null; } + @Override + public ClientOverrideConfiguration overrideConfiguration() { + return null; + } + @Override public MockAsyncClientBuilder endpointOverride(URI uri) { return null; diff --git a/flink-connectors/flink-connector-aws-kinesis-firehose/pom.xml b/flink-connectors/flink-connector-aws-kinesis-firehose/pom.xml index 74639990bf8..8ae174f25b3 100644 --- a/flink-connectors/flink-connector-aws-kinesis-firehose/pom.xml +++ b/flink-connectors/flink-connector-aws-kinesis-firehose/pom.xml @@ -33,11 +33,23 @@ under the License. <artifactId>flink-connector-aws-kinesis-firehose</artifactId> <name>Flink : Connectors : Amazon Kinesis Data Firehose</name> <properties> - <aws.sdk.version>2.17.52</aws.sdk.version> + <aws.sdk.version>2.17.247</aws.sdk.version> </properties> <packaging>jar</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdk.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.flink</groupId> @@ -58,22 +70,14 @@ under the License. <version>${project.version}</version> </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>sdk-core</artifactId> - <version>${aws.sdk.version}</version> - </dependency> - <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>firehose</artifactId> - <version>${aws.sdk.version}</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>netty-nio-client</artifactId> - <version>${aws.sdk.version}</version> </dependency> <!--Table Api Dependencies--> diff --git a/flink-connectors/flink-connector-aws-kinesis-streams/pom.xml b/flink-connectors/flink-connector-aws-kinesis-streams/pom.xml index 7c864efd5e5..9a8f4b10fa4 100644 --- a/flink-connectors/flink-connector-aws-kinesis-streams/pom.xml +++ b/flink-connectors/flink-connector-aws-kinesis-streams/pom.xml @@ -33,11 +33,23 @@ under the License. <artifactId>flink-connector-aws-kinesis-streams</artifactId> <name>Flink : Connectors : Amazon Kinesis Data Streams</name> <properties> - <aws.sdk.version>2.17.52</aws.sdk.version> + <aws.sdk.version>2.17.247</aws.sdk.version> </properties> <packaging>jar</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdk.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.flink</groupId> @@ -58,16 +70,9 @@ under the License. <version>${project.version}</version> </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>sdk-core</artifactId> - <version>${aws.sdk.version}</version> - </dependency> - <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>kinesis</artifactId> - <version>${aws.sdk.version}</version> </dependency> <!--Table API dependencies--> diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml index e9cb2a5441e..a79b436930d 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</artifactId> <name>Flink : Connectors : Kinesis</name> <properties> - <aws.sdk.version>1.12.7</aws.sdk.version> - <aws.sdkv2.version>2.17.52</aws.sdkv2.version> - <aws.kinesis-kcl.version>1.14.7</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> @@ -246,19 +249,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 375ffaf9aa8..bc8091d59ea 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,41 +6,41 @@ 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.7 +- 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.17.52 -- software.amazon.awssdk:aws-cbor-protocol:2.17.52 -- software.amazon.awssdk:aws-json-protocol:2.17.52 -- software.amazon.awssdk:protocol-core:2.17.52 -- software.amazon.awssdk:profiles:2.17.52 -- software.amazon.awssdk:sdk-core:2.17.52 -- software.amazon.awssdk:auth:2.17.52 +- 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: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.17.52 -- software.amazon.awssdk:regions:2.17.52 -- software.amazon.awssdk:annotations:2.17.52 -- software.amazon.awssdk:utils:2.17.52 -- software.amazon.awssdk:aws-core:2.17.52 -- software.amazon.awssdk:metrics-spi:2.17.52 -- software.amazon.awssdk:apache-client:2.17.52 -- software.amazon.awssdk:netty-nio-client:2.17.52 -- software.amazon.awssdk:sts:2.17.52 -- software.amazon.awssdk:aws-query-protocol:2.17.52 -- software.amazon.awssdk:json-utils:2.17.52 -- software.amazon.awssdk:third-party-jackson-core:2.17.52 -- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.17.52 +- 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: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 +- software.amazon.awssdk:json-utils:2.17.247 +- software.amazon.awssdk:third-party-jackson-core:2.17.247 +- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.17.247 - io.netty:netty-codec-http:4.1.70.Final - io.netty:netty-codec-http2:4.1.70.Final - io.netty:netty-codec:4.1.70.Final diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/JobManagerWatermarkTrackerTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/JobManagerWatermarkTrackerTest.java index 26a6af2e444..54801e0070e 100644 --- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/JobManagerWatermarkTrackerTest.java +++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/JobManagerWatermarkTrackerTest.java @@ -25,14 +25,14 @@ import org.apache.flink.streaming.api.functions.sink.SinkFunction; import org.apache.flink.streaming.api.functions.source.RichSourceFunction; import org.junit.Assert; -import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; /** Test for {@link JobManagerWatermarkTracker}. */ public class JobManagerWatermarkTrackerTest { - @ClassRule - public static final MiniClusterResource FLINK = + @Rule + public final MiniClusterResource miniCluster = new MiniClusterResource( new MiniClusterResourceConfiguration.Builder() .setNumberTaskManagers(1) diff --git a/flink-connectors/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE index 2304a8a0be2..ba6b964782a 100644 --- a/flink-connectors/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE @@ -7,24 +7,24 @@ 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) -- software.amazon.awssdk:firehose:2.17.52 -- software.amazon.awssdk:aws-json-protocol:2.17.52 -- software.amazon.awssdk:protocol-core:2.17.52 -- software.amazon.awssdk:profiles:2.17.52 -- software.amazon.awssdk:sdk-core:2.17.52 -- software.amazon.awssdk:auth:2.17.52 -- software.amazon.awssdk:http-client-spi:2.17.52 -- software.amazon.awssdk:regions:2.17.52 -- software.amazon.awssdk:annotations:2.17.52 -- software.amazon.awssdk:utils:2.17.52 -- software.amazon.awssdk:aws-core:2.17.52 -- software.amazon.awssdk:metrics-spi:2.17.52 -- software.amazon.awssdk:apache-client:2.17.52 -- software.amazon.awssdk:netty-nio-client:2.17.52 -- software.amazon.awssdk:sts:2.17.52 -- software.amazon.awssdk:aws-query-protocol:2.17.52 -- software.amazon.awssdk:json-utils:2.17.52 -- software.amazon.awssdk:third-party-jackson-core:2.17.52 +- software.amazon.awssdk:firehose:2.17.247 +- software.amazon.awssdk:aws-json-protocol: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.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: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 +- software.amazon.awssdk:json-utils:2.17.247 +- software.amazon.awssdk:third-party-jackson-core:2.17.247 - io.netty:netty-codec-http:4.1.70.Final - io.netty:netty-codec-http2:4.1.70.Final - io.netty:netty-codec:4.1.70.Final diff --git a/flink-connectors/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE b/flink-connectors/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE index 8b334b04457..17eadec380c 100644 --- a/flink-connectors/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE +++ b/flink-connectors/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE @@ -7,27 +7,26 @@ 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) -- software.amazon.awssdk:kinesis:2.17.52 -- software.amazon.awssdk:aws-cbor-protocol:2.17.52 -- software.amazon.awssdk:aws-json-protocol:2.17.52 -- software.amazon.awssdk:protocol-core:2.17.52 -- software.amazon.awssdk:profiles:2.17.52 -- software.amazon.awssdk:sdk-core:2.17.52 -- software.amazon.awssdk:auth:2.17.52 -- software.amazon.eventstream:eventstream:1.0.1 -- software.amazon.awssdk:http-client-spi:2.17.52 -- software.amazon.awssdk:regions:2.17.52 -- software.amazon.awssdk:annotations:2.17.52 -- software.amazon.awssdk:utils:2.17.52 -- software.amazon.awssdk:aws-core:2.17.52 -- software.amazon.awssdk:metrics-spi:2.17.52 -- software.amazon.awssdk:apache-client:2.17.52 -- software.amazon.awssdk:netty-nio-client:2.17.52 -- software.amazon.awssdk:sts:2.17.52 -- software.amazon.awssdk:aws-query-protocol:2.17.52 -- software.amazon.awssdk:json-utils:2.17.52 -- software.amazon.awssdk:third-party-jackson-core:2.17.52 -- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.17.52 +- 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: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.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: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 +- software.amazon.awssdk:json-utils:2.17.247 +- software.amazon.awssdk:third-party-jackson-core:2.17.247 +- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.17.247 - io.netty:netty-codec-http:4.1.70.Final - io.netty:netty-codec-http2:4.1.70.Final - io.netty:netty-codec:4.1.70.Final diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-aws-kinesis-firehose/pom.xml b/flink-end-to-end-tests/flink-end-to-end-tests-aws-kinesis-firehose/pom.xml index 31cc067fe43..2b463148fe2 100644 --- a/flink-end-to-end-tests/flink-end-to-end-tests-aws-kinesis-firehose/pom.xml +++ b/flink-end-to-end-tests/flink-end-to-end-tests-aws-kinesis-firehose/pom.xml @@ -28,13 +28,25 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>flink-end-to-end-tests-aws-kinesis-firehose</artifactId> <name>Flink : E2E Tests : Kinesis Firehose SQL tests</name> + <packaging>jar</packaging> + <properties> - <aws.sdk.version>2.17.52</aws.sdk.version> + <aws.sdk.version>2.17.247</aws.sdk.version> </properties> - <packaging>jar</packaging> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdk.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> @@ -90,14 +102,12 @@ <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>s3</artifactId> - <version>${aws.sdk.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>iam</artifactId> - <version>${aws.sdk.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -146,6 +156,4 @@ </plugin> </plugins> </build> - - </project> diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml b/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml index 96316403fdc..b36c6a0fca0 100644 --- a/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml +++ b/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml @@ -33,49 +33,99 @@ under the License. <packaging>jar</packaging> <properties> - <guava.version>29.0-jre</guava.version> - <netty.version>4.1.68.Final</netty.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>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdkv2.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - <version>${netty.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>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>${netty.version}</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.19.4</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-common</artifactId> <version>${kotlin.version}</version> </dependency> - + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlinx</groupId> + <artifactId>kotlinx-serialization-core-jvm</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + <version>3.5.0</version> + </dependency> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + <version>2.8.0</version> + </dependency> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>17.0.0</version> + </dependency> + <dependency> + <groupId>com.github.docker-java</groupId> + <artifactId>docker-java-api</artifactId> + <version>3.2.13</version> + </dependency> + <dependency> + <groupId>com.github.docker-java</groupId> + <artifactId>docker-java-transport-zerodep</artifactId> + <version>3.2.13</version> + </dependency> + <dependency> + <groupId>com.github.docker-java</groupId> + <artifactId>docker-java-transport</artifactId> + <version>3.2.13</version> + </dependency> + <dependency> + <groupId>com.amazonaws</groupId> + <artifactId>amazon-kinesis-client</artifactId> + <version>1.14.7</version> + </dependency> </dependencies> </dependencyManagement> @@ -117,11 +167,6 @@ under the License. <version>${project.version}</version> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-connector-kinesis</artifactId> diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml b/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml index 19121084be0..f1c2cdf7be0 100644 --- a/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml +++ b/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml @@ -33,56 +33,84 @@ under the License. <packaging>jar</packaging> <properties> - <guava.version>29.0-jre</guava.version> - <netty.version>4.1.68.Final</netty.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> - <classgraph.version>4.8.120</classgraph.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 >com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>${guava.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdkv2.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> - <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-handler</artifactId> - <version>${netty.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>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>${netty.version}</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.19.4</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-common</artifactId> <version>${kotlin.version}</version> </dependency> - + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlinx</groupId> + <artifactId>kotlinx-serialization-core-jvm</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + <version>3.5.0</version> + </dependency> <dependency> <groupId>io.github.classgraph</groupId> <artifactId>classgraph</artifactId> - <version>${classgraph.version}</version> + <version>4.8.120</version> + </dependency> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + <version>2.8.0</version> + </dependency> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>17.0.0</version> </dependency> - </dependencies> </dependencyManagement> @@ -136,11 +164,6 @@ under the License. <artifactId>flink-json-glue-schema-registry_${scala.binary.version}</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> <build> diff --git a/flink-formats/flink-avro-glue-schema-registry/pom.xml b/flink-formats/flink-avro-glue-schema-registry/pom.xml index 41e59016cf1..6b1121ad99e 100644 --- a/flink-formats/flink-avro-glue-schema-registry/pom.xml +++ b/flink-formats/flink-avro-glue-schema-registry/pom.xml @@ -35,30 +35,61 @@ under the License. <properties> <glue.schema.registry.version>1.1.8</glue.schema.registry.version> - <aws.sdkv2.version>2.17.52</aws.sdkv2.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>bom</artifactId> + <version>${aws.sdkv2.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <!-- For dependency convergence --> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.19.4</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> + </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-common</artifactId> <version>${kotlin.version}</version> </dependency> - + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlinx</groupId> + <artifactId>kotlinx-serialization-core-jvm</artifactId> + <version>1.0.1</version> + </dependency> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>17.0.0</version> + </dependency> </dependencies> </dependencyManagement> @@ -84,18 +115,19 @@ under the License. <version>${project.version}</version> </dependency> + <!-- ArchUit test dependencies --> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-architecture-tests-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> <!-- This has a transitive dependency on mbknor-jackson-jsonschema which needs scala --> <groupId>software.amazon.glue</groupId> <artifactId>schema-registry-serde</artifactId> <version>${glue.schema.registry.version}</version> - <exclusions> - <!-- Testcontainers dependency includes a newer version --> - <exclusion> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> diff --git a/flink-formats/flink-json-glue-schema-registry/pom.xml b/flink-formats/flink-json-glue-schema-registry/pom.xml index 3982ae53d2d..1c45f56e197 100644 --- a/flink-formats/flink-json-glue-schema-registry/pom.xml +++ b/flink-formats/flink-json-glue-schema-registry/pom.xml @@ -34,50 +34,68 @@ under the License. <properties> <glue.schema.registry.version>1.1.8</glue.schema.registry.version> - <aws.sdkv2.version>2.17.52</aws.sdkv2.version> + <aws.sdkv2.version>2.17.247</aws.sdkv2.version> <netty.version>4.1.68.Final</netty.version> <kotlin.version>1.3.50</kotlin.version> <classgraph.version>4.8.120</classgraph.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>io.netty</groupId> - <artifactId>netty-handler</artifactId> - <version>${netty.version}</version> + <groupId>software.amazon.awssdk</groupId> + <artifactId>bom</artifactId> + <version>${aws.sdkv2.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> + <!-- For dependency convergence --> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-codec-http</artifactId> - <version>${netty.version}</version> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>3.19.4</version> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-reflect</artifactId> + <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib</artifactId> <version>${kotlin.version}</version> </dependency> - <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-common</artifactId> <version>${kotlin.version}</version> </dependency> - + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + <dependency> + <groupId>org.jetbrains.kotlinx</groupId> + <artifactId>kotlinx-serialization-core-jvm</artifactId> + <version>1.0.1</version> + </dependency> <dependency> <groupId>io.github.classgraph</groupId> <artifactId>classgraph</artifactId> - <version>${classgraph.version}</version> + <version>4.8.120</version> + </dependency> + <dependency> + <groupId>org.jetbrains</groupId> + <artifactId>annotations</artifactId> + <version>17.0.0</version> </dependency> - </dependencies> </dependencyManagement> @@ -116,23 +134,10 @@ under the License. <version>${glue.schema.registry.version}</version> </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>aws-core</artifactId> - <version>${aws.sdkv2.version}</version> - </dependency> - <dependency> <groupId>com.kjetland</groupId> <artifactId>mbknor-jackson-jsonschema_${scala.binary.version}</artifactId> <version>1.0.39</version> - <exclusions> - <!-- Testcontainers dependency includes a newer version --> - <exclusion> - <groupId>org.jetbrains</groupId> - <artifactId>annotations</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -141,6 +146,13 @@ under the License. <version>1.12.2</version> </dependency> + <!-- ArchUit test dependencies --> + + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-architecture-tests-test</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project>
