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

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 0cc5d10430 upgrade flink to 1.19.0 (#12659)
0cc5d10430 is described below

commit 0cc5d1043024c70986b79ac0381883c889090063
Author: sullis <git...@seansullivan.com>
AuthorDate: Fri May 10 23:21:12 2024 -0700

    upgrade flink to 1.19.0 (#12659)
---
 pinot-connectors/pinot-flink-connector/pom.xml | 18 ++++++------------
 pom.xml                                        | 18 +++++++++++++++---
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/pinot-connectors/pinot-flink-connector/pom.xml 
b/pinot-connectors/pinot-flink-connector/pom.xml
index a69cf4ad98..9468e20b4b 100644
--- a/pinot-connectors/pinot-flink-connector/pom.xml
+++ b/pinot-connectors/pinot-flink-connector/pom.xml
@@ -43,7 +43,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_${scala.compat.version}</artifactId>
+      <artifactId>flink-streaming-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.flink</groupId>
+      <artifactId>flink-java</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.pinot</groupId>
@@ -74,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-clients_${scala.compat.version}</artifactId>
+      <artifactId>flink-clients</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -83,16 +87,6 @@
       <version>${project.parent.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.scala-lang</groupId>
-          <artifactId>scala-library</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.scala-lang.modules</groupId>
-          <artifactId>scala-java8-compat_2.12</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
   </dependencies>
   <build>
diff --git a/pom.xml b/pom.xml
index bee21977ab..06c37b818e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
 
     <confluent.version>7.6.1</confluent.version>
     <pulsar.version>3.2.2</pulsar.version>
-    <flink.version>1.14.6</flink.version>
+    <flink.version>1.19.0</flink.version>
 
     <!-- Apache Commons Libraries -->
     <commons-lang3.version>3.14.0</commons-lang3.version>
@@ -1448,15 +1448,27 @@
 
       <dependency>
         <groupId>org.apache.flink</groupId>
-        <artifactId>flink-clients_${scala.compat.version}</artifactId>
+        <artifactId>flink-clients</artifactId>
         <version>${flink.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.flink</groupId>
-        <artifactId>flink-streaming-java_${scala.compat.version}</artifactId>
+        <artifactId>flink-streaming-java</artifactId>
         <version>${flink.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.flink</groupId>
+        <artifactId>flink-java</artifactId>
+        <version>${flink.version}</version>
+        <exclusions>
+          <!-- excluding Kryo library due to Maven Enforcer convergence error 
-->
+          <exclusion>
+            <groupId>com.esotericsoftware.kryo</groupId>
+            <artifactId>kryo</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-stdlib-jdk8</artifactId>


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org

Reply via email to