You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ni...@apache.org on 2022/05/25 15:03:08 UTC

[rocketmq-flink] branch main updated: Bump flink version to 1.15.0.

This is an automated email from the ASF dual-hosted git repository.

nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-flink.git


The following commit(s) were added to refs/heads/main by this push:
     new 619e889  Bump flink version to 1.15.0.
     new 64c11ff  Merge pull request #31 from GOODBOY008/bump_flink_version
619e889 is described below

commit 619e88964431ecf140165462322fc80ee1897993
Author: gongzhongqiang <76...@qq.com>
AuthorDate: Wed May 25 10:31:46 2022 +0800

    Bump flink version to 1.15.0.
---
 pom.xml                                                       | 11 +++++------
 .../apache/rocketmq/flink/legacy/RocketMQSourceFunction.java  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5e76d52..72268c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <rocketmq.version>4.9.2</rocketmq.version>
-        <flink.version>1.14.3</flink.version>
+        <flink.version>1.15.0</flink.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <scala.binary.version>2.11</scala.binary.version>
         <spotless.version>2.4.2</spotless.version>
 	    <jaxb-api.version>2.3.1</jaxb-api.version>
     </properties>
@@ -50,13 +49,13 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+            <artifactId>flink-streaming-java</artifactId>
             <version>${flink.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_${scala.binary.version}</artifactId>
+            <artifactId>flink-clients</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
@@ -71,12 +70,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-api-java-bridge</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
+            <artifactId>flink-table-runtime</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
diff --git a/src/main/java/org/apache/rocketmq/flink/legacy/RocketMQSourceFunction.java b/src/main/java/org/apache/rocketmq/flink/legacy/RocketMQSourceFunction.java
index e46daed..3707227 100644
--- a/src/main/java/org/apache/rocketmq/flink/legacy/RocketMQSourceFunction.java
+++ b/src/main/java/org/apache/rocketmq/flink/legacy/RocketMQSourceFunction.java
@@ -48,7 +48,7 @@ import org.apache.flink.streaming.api.functions.source.RichParallelSourceFunctio
 import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
 import org.apache.flink.util.Preconditions;
 
-import org.apache.flink.shaded.curator4.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import org.apache.flink.shaded.curator5.com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.lang.Validate;