You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2017/09/20 07:54:07 UTC
[1/2] beam git commit: [BEAM-2377] Allow cross compilation (2.10,
2.11) for flink runner
Repository: beam
Updated Branches:
refs/heads/master 64123e9d3 -> a1835c619
[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.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/ab975317
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/ab975317
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/ab975317
Branch: refs/heads/master
Commit: ab975317e1aa532053b68ccc105e13afff0c0b1a
Parents: 64123e9
Author: Ole Langbehn <ol...@inoio.de>
Authored: Wed May 31 09:54:04 2017 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed Sep 20 09:36:53 2017 +0200
----------------------------------------------------------------------
examples/java/pom.xml | 2 +-
examples/java8/pom.xml | 2 +-
pom.xml | 16 +++++++++++++++-
runners/flink/pom.xml | 14 +++++++-------
sdks/java/javadoc/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
7 files changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index ade4cac..817af33 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/examples/java8/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index 585d7b8..f27f6df 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 236645c..f112c64 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 0ef1931..5c680c8 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/sdks/java/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml
index 35f0b86..1d90046 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/sdks/java/maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 ffdb066..9257989 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>
http://git-wip-us.apache.org/repos/asf/beam/blob/ab975317/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
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 b8b9c9f..59bd5c2 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>
[2/2] beam git commit: This closes #3255
Posted by al...@apache.org.
This closes #3255
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a1835c61
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a1835c61
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a1835c61
Branch: refs/heads/master
Commit: a1835c6191a480f88f0dc03f69d2c7c31d7ed624
Parents: 64123e9 ab97531
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Wed Sep 20 09:37:44 2017 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Wed Sep 20 09:37:44 2017 +0200
----------------------------------------------------------------------
examples/java/pom.xml | 2 +-
examples/java8/pom.xml | 2 +-
pom.xml | 16 +++++++++++++++-
runners/flink/pom.xml | 14 +++++++-------
sdks/java/javadoc/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
.../src/main/resources/archetype-resources/pom.xml | 2 +-
7 files changed, 27 insertions(+), 13 deletions(-)
----------------------------------------------------------------------