Merge pull request #467 from juripetersen/fix-flink-versioning

Align flink.version throughout project
apache · Aug 29, 2024 · a2f5ed7 · a2f5ed7
2 parents 7895720 + a0c63f5
commit a2f5ed7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -105,6 +105,7 @@
         <scala.version>2.12.12</scala.version>
         <scala.mayor.version>2.12</scala.mayor.version>
         <spark.version>3.1.2</spark.version>
+        <flink.version>1.20.0</flink.version>
 
         <java.version>11</java.version>
         <source.level>11</source.level>

diff --git a/wayang-api/wayang-api-python/pom.xml b/wayang-api/wayang-api-python/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <java-module-name>org.apache.wayang.api</java-module-name>
         <spark.version>2.4.0</spark.version>
-        <flink.version>1.7.1</flink.version>
         <scala.mayor.version>2.12</scala.mayor.version>
         <giraph.version>1.2.0-hadoop2</giraph.version>
     </properties>

diff --git a/wayang-benchmark/pom.xml b/wayang-benchmark/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>org.apache.flink</groupId>
       <artifactId>flink-java</artifactId>
-      <version>1.7.1</version>
+      <version>${flink.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.wayang</groupId>

diff --git a/wayang-platforms/wayang-flink/pom.xml b/wayang-platforms/wayang-flink/pom.xml
@@ -36,7 +36,6 @@
 
     <properties>
         <java-module-name>org.apache.wayang.platform.flink</java-module-name>
-        <flink.version>1.10.0</flink.version>
     </properties>
 
     <dependencies>
@@ -85,7 +84,7 @@
         </dependency>
         <dependency>
           <groupId>org.apache.flink</groupId>
-          <artifactId>flink-clients_2.12</artifactId>
+          <artifactId>flink-clients</artifactId>
           <version>${flink.version}</version>
           <exclusions>
             <exclusion>

diff --git a/wayang-tests-integration/pom.xml b/wayang-tests-integration/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         <java-module-name>org.apache.wayang.test.integration</java-module-name>
-        <flink.version>1.10.0</flink.version>
         <giraph.version>1.2.0-hadoop2</giraph.version>
     </properties>
 
@@ -129,7 +128,7 @@
 
         <dependency>
           <groupId>org.apache.flink</groupId>
-          <artifactId>flink-clients_2.12</artifactId>
+          <artifactId>flink-clients</artifactId>
           <version>${flink.version}</version>
           <scope>test</scope>
           <exclusions>