From f95b96968af68c702f18daa7c3b973ac766fd2c7 Mon Sep 17 00:00:00 2001
From: Maximilian Michels <mxm@apache.org>
Date: Fri, 11 Mar 2016 11:19:58 +0100
Subject: [PATCH] [BEAM-107] [flink] support multiple Scala versions

- introduces a Maven property to support different Scala major versions
---
 runners/flink/pom.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 9bd705c7068bf..b1929d2170688 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -49,6 +49,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <flink.version>1.0.0</flink.version>
         <beam.version>1.5.0-SNAPSHOT</beam.version>
+        <scala.major.version>2.10</scala.major.version>
         <!-- Default parameters for mvn exec:exec -->
         <clazz>org.apache.beam.runners.flink.examples.WordCount</clazz>
         <input>kinglear.txt</input>
@@ -78,12 +79,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.10</artifactId>
+            <artifactId>flink-streaming-java_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.10</artifactId>
+            <artifactId>flink-streaming-java_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
@@ -95,23 +96,23 @@
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_2.10</artifactId>
+            <artifactId>flink-clients_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_2.10</artifactId>
+            <artifactId>flink-test-utils_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.8_2.10</artifactId>
+            <artifactId>flink-connector-kafka-0.8_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.flink</groupId>
-            <artifactId>flink-avro_2.10</artifactId>
+            <artifactId>flink-avro_${scala.major.version}</artifactId>
             <version>${flink.version}</version>
         </dependency>
         <dependency>