You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by da...@apache.org on 2021/06/29 07:25:55 UTC
[flink] 02/02: [FLINK-18182][kinesis] Updating guava to 29.0-jre
for Kinesis connector
This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ba3e0d436962f20b1eacd10ed8dd1748d26a3ef5
Author: Danny Cranmer <da...@apache.org>
AuthorDate: Mon Jun 28 15:47:15 2021 +0100
[FLINK-18182][kinesis] Updating guava to 29.0-jre for Kinesis connector
---
flink-connectors/flink-connector-kinesis/pom.xml | 27 ++++++----------------
.../connectors/kinesis/FlinkKinesisProducer.java | 3 ++-
.../src/main/resources/META-INF/NOTICE | 1 +
3 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index fcf28e7..ae6eded 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -37,6 +37,7 @@ under the License.
<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.3</aws.dynamodbstreams-kinesis-adapter.version>
+ <guava.version>29.0-jre</guava.version>
</properties>
<packaging>jar</packaging>
@@ -127,6 +128,12 @@ under the License.
<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>
@@ -135,32 +142,12 @@ 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>
<dependency>
diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java
index a2d3fbd..9334bfd 100644
--- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java
+++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisProducer.java
@@ -40,6 +40,7 @@ import com.amazonaws.services.kinesis.producer.UserRecordResult;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -319,7 +320,7 @@ public class FlinkKinesisProducer<OUT> extends RichSinkFunction<OUT>
ListenableFuture<UserRecordResult> cb =
producer.addUserRecord(stream, partition, explicitHashkey, serialized);
- Futures.addCallback(cb, callback);
+ Futures.addCallback(cb, callback, MoreExecutors.directExecutor());
}
@Override
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 a734e7b..be3c6dd 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
@@ -14,6 +14,7 @@ This project bundles the following dependencies under the Apache Software Licens
- 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:dynamodb-streams-kinesis-adapter:1.5.3
- com.amazonaws:jmespath-java:1.12.7
- org.apache.httpcomponents:httpclient:4.5.9