From e62be19c70b8ca62132393c3ab5c08dc292b4258 Mon Sep 17 00:00:00 2001
From: Sergei Lebedev <superbobry@gmail.com>
Date: Wed, 10 May 2017 17:42:40 +0200
Subject: [PATCH] Removed 'flink.suffix' and added 'flink.version' (#2277)

The former was just Scala binary tag, and the latter was hardcoded in
the 'xgboost4j-flink' POM.
---
 jvm-packages/pom.xml                 |  4 ++--
 jvm-packages/xgboost4j-flink/pom.xml | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jvm-packages/pom.xml b/jvm-packages/pom.xml
index f018b316a..6cf06ee62 100644
--- a/jvm-packages/pom.xml
+++ b/jvm-packages/pom.xml
@@ -14,8 +14,8 @@
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.version>3.3.9</maven.version>
+        <flink.version>0.10.2</flink.version>
         <spark.version>2.1.0</spark.version>
-        <flink.suffix>_2.11</flink.suffix>
         <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
     </properties>
@@ -39,8 +39,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <!--<properties>-->
+            <!--<flink.version>0.10.2</flink.version> -->
             <!--<spark.version>2.0.1</spark.version>-->
-            <!--<flink.suffix>_2.11</flink.suffix>-->
             <!--<scala.version>2.11.8</scala.version>-->
             <!--<scala.binary.version>2.11</scala.binary.version>-->
             <!--</properties>-->
diff --git a/jvm-packages/xgboost4j-flink/pom.xml b/jvm-packages/xgboost4j-flink/pom.xml
index 0414195ac..855e7e847 100644
--- a/jvm-packages/xgboost4j-flink/pom.xml
+++ b/jvm-packages/xgboost4j-flink/pom.xml
@@ -35,18 +35,18 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-scala${flink.suffix}</artifactId>
-            <version>0.10.2</version>
+            <artifactId>flink-scala_${scala.binary.version}</artifactId>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients${flink.suffix}</artifactId>
-            <version>0.10.2</version>
+            <artifactId>flink-clients_${scala.binary.version}</artifactId>
+            <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-ml${flink.suffix}</artifactId>
-            <version>0.10.2</version>
+            <artifactId>flink-ml_${scala.binary.version}</artifactId>
+            <version>${flink.version}</version>
         </dependency>
     </dependencies>