You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by "ASF GitHub Bot (JIRA)" <ji...@apache.org> on 2018/01/05 13:14:00 UTC
[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala
2.11
[ https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16313077#comment-16313077 ]
ASF GitHub Bot commented on BEAM-2377:
--------------------------------------
aljoscha closed pull request #3881: [BEAM-2377] Allow cross compilation (2.10,2.11) for flink runner
URL: https://github.com/apache/beam/pull/3881
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index ade4cac7a49..817af333690 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 585d7b8ce2d..f27f6dfbe2a 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 236645cb989..f112c6409a8 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 0ef19312b84..5c680c86861 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 35f0b864e51..1d90046838c 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 ffdb0660466..9257989ddf7 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 b8b9c9f0fa4..59bd5c211a4 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 67628a12831..d7e41759ef3 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>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
> Cross compile flink runner to scala 2.11
> ----------------------------------------
>
> Key: BEAM-2377
> URL: https://issues.apache.org/jira/browse/BEAM-2377
> Project: Beam
> Issue Type: Improvement
> Components: runner-flink
> Reporter: Ole Langbehn
> Assignee: Aljoscha Krettek
> Fix For: Not applicable
>
>
> The flink runner is compiled for flink built against scala 2.10. flink cross compiles its scala artifacts against 2.10 and 2.11.
> In order to make it possible to use beam with the flink runner in scala 2.11 projects, it would be nice if you could publish the flink runner for 2.11 next to 2.10.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)