[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala 2.11

2018-01-05 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=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 @@
   
 
   org.apache.beam
-  beam-runners-flink_2.10
+  beam-runners-flink_${flink.scala.version}
   runtime
   
 
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 @@
   
 
   org.apache.beam
-  beam-runners-flink_2.10
+  beam-runners-flink_${flink.scala.version}
   runtime
   
 
diff --git a/pom.xml b/pom.xml
index 236645cb989..f112c6409a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,6 +154,7 @@
 1.1.4
 0.10.1.0
 1.4
+2.11
 
 1.5.0.Final
 2.0
@@ -363,6 +364,19 @@
 
   
 
+
+
+  flink-scala-2.10
+  
+
+  flink-scala-2.10
+
+  
+  
+2.10
+  
+
+
   
 
   
@@ -606,7 +620,7 @@
 
   
 org.apache.beam
-beam-runners-flink_2.10
+beam-runners-flink_${flink.scala.version}
 ${project.version}
   
 
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 @@
 ../pom.xml
   
 
-  beam-runners-flink_2.10
+  beam-runners-flink_${flink.scala.version}
   Apache Beam :: Runners :: Flink
   jar
 
@@ -165,7 +165,7 @@
 
 
   org.apache.flink
-  flink-clients_2.10
+  flink-clients_${flink.scala.version}
   ${flink.version}
 
 
@@ -189,13 +189,13 @@
 
 
   org.apache.flink
-  flink-runtime_2.10
+  flink-runtime_${flink.scala.version}
   ${flink.version}
 
 
 
   org.apache.flink
-  flink-streaming-java_2.10
+  flink-streaming-java_${flink.scala.version}
   ${flink.version}
 
 
@@ -210,7 +210,7 @@
 
 
   org.apache.flink
-  flink-runtime_2.10
+  flink-runtime_${flink.scala.version}
   ${flink.version}
   test-jar
   test
@@ -336,7 +336,7 @@
 
 
   org.apache.flink
-  flink-streaming-java_2.10
+  flink-streaming-java_${flink.scala.version}
   ${flink.version}
   test
   test-jar
@@ -344,7 +344,7 @@
 
 
   org.apache.flink
-  flink-test-utils_2.10
+  flink-test-utils_${flink.scala.version}
   ${flink.version}
   test
   
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 @@
 
 
   org.apache.beam
-  beam-runners-flink_2.10
+  beam-runners-flink_${flink.scala.version}
 
 
 
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 @@
   
 
   org.apache.beam
-  beam-runners-flink_2.10
+  beam-runners-flink_@flink.scala.version@
   ${beam.version}
   runtime
 
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 @@
   
 
   org.apache.beam
-  beam-runners-flink_2.10
+  beam-runners-flink_@flink.scala.version@
   ${beam.version}
   runtime
 
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 @@

[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala 2.11

2017-09-21 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16174641#comment-16174641
 ] 

ASF GitHub Bot commented on BEAM-2377:
--

GitHub user aljoscha opened a pull request:

https://github.com/apache/beam/pull/3881

[BEAM-2377] Allow cross compilation (2.10,2.11) for flink runner

This is a fixed version of #3255 which was reverted in #3875. The problem 
was that `flink.scala.version` was not set in the nexmark pom.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aljoscha/beam fix-pr-3255-scala-version

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/beam/pull/3881.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #3881


commit f61605b4199c6904a6dcbd111ffb906491fa9e0e
Author: Ole Langbehn 
Date:   2017-05-31T07:54:04Z

[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.




> 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: 2.2.0
>
>
> 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)

[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala 2.11

2017-09-20 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16172873#comment-16172873
 ] 

ASF GitHub Bot commented on BEAM-2377:
--

Github user asfgit closed the pull request at:

https://github.com/apache/beam/pull/3255


> 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: 2.2.0
>
>
> 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)

[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala 2.11

2017-05-31 Thread Aljoscha Krettek (JIRA) 

[ 
https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16031082#comment-16031082
 ] 

Aljoscha Krettek commented on BEAM-2377:


[~davor] I'm not to familiar with our CI infra but I imagine it would be enough 
to add a new Jenkins job that also does nightly snapshot releases for Scala 
2.11. In addition we would add this to the release process. What do you think?

> 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
>
> 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.3.15#6346)

[jira] [Commented] (BEAM-2377) Cross compile flink runner to scala 2.11

2017-05-29 Thread ASF GitHub Bot (JIRA) 

[ 
https://issues.apache.org/jira/browse/BEAM-2377?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16028407#comment-16028407
 ] 

ASF GitHub Bot commented on BEAM-2377:
--

GitHub user neurolabs opened a pull request:

https://github.com/apache/beam/pull/3255

[BEAM-2377] Allow usage of scala 2.11 dependencies as well as cross 
compilation 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
scala.version mvn property that is set to 2.10 as a default, as well as
a mvn profile that overrides the scala version to 2.11.

I'm not sure about the granularity (should I only enable this for the
flink runner, or should the whole build be verified against 2.11). So
please comment on this PR.

It would be nice if you could cross publish the flink runner for
scala-2.11 based on this pull request.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/neurolabs/beam master

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/beam/pull/3255.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #3255


commit 3e2564d65fb371abd0caf663785faee4f1f73120
Author: Ole Langbehn 
Date:   2017-05-29T14:14:18Z

Allow usage of scala 2.11 dependencies as well as cross compilation 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
scala.version mvn property that is set to 2.10 as a default, as well as
a mvn profile that overrides the scala version to 2.11.




> 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
>
> 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.3.15#6346)