From 7107b7153461521349a660a1982dd7892a479df2 Mon Sep 17 00:00:00 2001
From: Ole Langbehn <ole.langbehn@inoio.de>
Date: Wed, 31 May 2017 09:54:04 +0200
Subject: [PATCH] [BEAM-2377] Allow cross compilation (2.10,2.11) for flink
 runner

Flink allows being built against scala 2.11. But the Flink Runner did
not.

This commit alleviates that, as well as allowing for ensuring that
builds work against scala 2.11 dependencies. It introduces a
flink.scala.version mvn property that is set to 2.11 as a default, as well as
a mvn profile that overrides the scala version to 2.10.
---
 examples/java/pom.xml                            |  2 +-
 examples/java8/pom.xml                           |  2 +-
 pom.xml                                          | 16 +++++++++++++++-
 runners/flink/pom.xml                            | 14 +++++++-------
 sdks/java/javadoc/pom.xml                        |  2 +-
 .../main/resources/archetype-resources/pom.xml   |  2 +-
 .../main/resources/archetype-resources/pom.xml   |  2 +-
 sdks/java/nexmark/pom.xml                        |  2 +-
 8 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index ade4cac7a490..817af3336908 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -95,7 +95,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.beam</groupId>
-          <artifactId>beam-runners-flink_2.10</artifactId>
+          <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index 585d7b8ce2d6..f27f6dfbe2a8 100644
--- a/examples/java8/pom.xml
+++ b/examples/java8/pom.xml
@@ -95,7 +95,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.beam</groupId>
-          <artifactId>beam-runners-flink_2.10</artifactId>
+          <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>
diff --git a/pom.xml b/pom.xml
index 236645cb9892..f112c6409a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,7 @@
     <snappy-java.version>1.1.4</snappy-java.version>
     <kafka.clients.version>0.10.1.0</kafka.clients.version>
     <commons.csv.version>1.4</commons.csv.version>
+    <flink.scala.version>2.11</flink.scala.version>
 
     <os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
     <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
@@ -363,6 +364,19 @@
         </pluginManagement>
       </build>
     </profile>
+
+    <profile>
+      <id>flink-scala-2.10</id>
+      <activation>
+        <property>
+          <name>flink-scala-2.10</name>
+        </property>
+      </activation>
+      <properties>
+        <flink.scala.version>2.10</flink.scala.version>
+      </properties>
+    </profile>
+
   </profiles>
 
   <dependencyManagement>
@@ -606,7 +620,7 @@
 
       <dependency>
         <groupId>org.apache.beam</groupId>
-        <artifactId>beam-runners-flink_2.10</artifactId>
+        <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
         <version>${project.version}</version>
       </dependency>
 
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 0ef19312b842..5c680c868617 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -26,7 +26,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>beam-runners-flink_2.10</artifactId>
+  <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
   <name>Apache Beam :: Runners :: Flink</name>
   <packaging>jar</packaging>
 
@@ -165,7 +165,7 @@
     <!-- Flink dependencies -->
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-clients_2.10</artifactId>
+      <artifactId>flink-clients_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
@@ -189,13 +189,13 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-runtime_2.10</artifactId>
+      <artifactId>flink-runtime_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_2.10</artifactId>
+      <artifactId>flink-streaming-java_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
@@ -210,7 +210,7 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-runtime_2.10</artifactId>
+      <artifactId>flink-runtime_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
@@ -336,7 +336,7 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_2.10</artifactId>
+      <artifactId>flink-streaming-java_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
@@ -344,7 +344,7 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-test-utils_2.10</artifactId>
+      <artifactId>flink-test-utils_${flink.scala.version}</artifactId>
       <version>${flink.version}</version>
       <scope>test</scope>
       <exclusions>
diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml
index 35f0b864e51a..1d90046838c6 100644
--- a/sdks/java/javadoc/pom.xml
+++ b/sdks/java/javadoc/pom.xml
@@ -64,7 +64,7 @@
 
     <dependency>
       <groupId>org.apache.beam</groupId>
-      <artifactId>beam-runners-flink_2.10</artifactId>
+      <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
     </dependency>
 
     <dependency>
diff --git a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
index ffdb06604666..9257989ddf72 100644
--- a/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
@@ -215,7 +215,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.beam</groupId>
-          <artifactId>beam-runners-flink_2.10</artifactId>
+          <artifactId>beam-runners-flink_@flink.scala.version@</artifactId>
           <version>${beam.version}</version>
           <scope>runtime</scope>
         </dependency>
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index b8b9c9f0fa49..59bd5c211a48 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -214,7 +214,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.beam</groupId>
-          <artifactId>beam-runners-flink_2.10</artifactId>
+          <artifactId>beam-runners-flink_@flink.scala.version@</artifactId>
           <version>${beam.version}</version>
           <scope>runtime</scope>
         </dependency>
diff --git a/sdks/java/nexmark/pom.xml b/sdks/java/nexmark/pom.xml
index 67628a128316..d7e41759ef39 100644
--- a/sdks/java/nexmark/pom.xml
+++ b/sdks/java/nexmark/pom.xml
@@ -67,7 +67,7 @@
       <dependencies>
         <dependency>
           <groupId>org.apache.beam</groupId>
-          <artifactId>beam-runners-flink_2.10</artifactId>
+          <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
           <scope>runtime</scope>
         </dependency>
       </dependencies>