Repository: incubator-beam Updated Branches: refs/heads/master de91b8014 -> 45309caec
[BEAM-107] [flink] support multiple Scala versions - introduces a Maven property to support different Scala major versions Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/45309cae Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/45309cae Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/45309cae Branch: refs/heads/master Commit: 45309caec4da583ea7a3f92dd33ed1133754dffc Parents: de91b80 Author: Maximilian Michels <[email protected]> Authored: Fri Mar 11 11:19:58 2016 +0100 Committer: Maximilian Michels <[email protected]> Committed: Fri Mar 11 11:31:07 2016 +0100 ---------------------------------------------------------------------- runners/flink/pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/45309cae/runners/flink/pom.xml ---------------------------------------------------------------------- diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml index 9bd705c..b1929d2 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>
