beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rober...@apache.org
Subject [1/2] beam git commit: Revert "[BEAM-2377] Allow cross compilation (2.10, 2.11) for flink runner"
Date Wed, 20 Sep 2017 23:56:59 GMT
Repository: beam
Updated Branches:
  refs/heads/master ddc0a7d83 -> a92c45f93


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

This reverts commit ab975317e1aa532053b68ccc105e13afff0c0b1a.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e1548435
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e1548435
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e1548435

Branch: refs/heads/master
Commit: e1548435c45b1e4b349f55df1e37e1b6de8fc500
Parents: ddc0a7d
Author: Charles Chen <ccy@google.com>
Authored: Wed Sep 20 15:17:34 2017 -0700
Committer: Robert Bradshaw <robertwb@gmail.com>
Committed: Wed Sep 20 16:56:36 2017 -0700

----------------------------------------------------------------------
 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, 13 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 817af33..ade4cac 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_${flink.scala.version}</artifactId>
+          <artifactId>beam-runners-flink_2.10</artifactId>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/examples/java8/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index f27f6df..585d7b8 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_${flink.scala.version}</artifactId>
+          <artifactId>beam-runners-flink_2.10</artifactId>
           <scope>runtime</scope>
           <exclusions>
             <exclusion>

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f112c64..236645c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,6 @@
     <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>
@@ -364,19 +363,6 @@
         </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>
@@ -620,7 +606,7 @@
 
       <dependency>
         <groupId>org.apache.beam</groupId>
-        <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
+        <artifactId>beam-runners-flink_2.10</artifactId>
         <version>${project.version}</version>
       </dependency>
 

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/runners/flink/pom.xml
----------------------------------------------------------------------
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 5c680c8..0ef1931 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -26,7 +26,7 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>beam-runners-flink_${flink.scala.version}</artifactId>
+  <artifactId>beam-runners-flink_2.10</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_${flink.scala.version}</artifactId>
+      <artifactId>flink-clients_2.10</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
@@ -189,13 +189,13 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-runtime_${flink.scala.version}</artifactId>
+      <artifactId>flink-runtime_2.10</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-streaming-java_${flink.scala.version}</artifactId>
+      <artifactId>flink-streaming-java_2.10</artifactId>
       <version>${flink.version}</version>
     </dependency>
 
@@ -210,7 +210,7 @@
 
     <dependency>
       <groupId>org.apache.flink</groupId>
-      <artifactId>flink-runtime_${flink.scala.version}</artifactId>
+      <artifactId>flink-runtime_2.10</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_${flink.scala.version}</artifactId>
+      <artifactId>flink-streaming-java_2.10</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_${flink.scala.version}</artifactId>
+      <artifactId>flink-test-utils_2.10</artifactId>
       <version>${flink.version}</version>
       <scope>test</scope>
       <exclusions>

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/sdks/java/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml
index 1d90046..35f0b86 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_${flink.scala.version}</artifactId>
+      <artifactId>beam-runners-flink_2.10</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/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 9257989..ffdb066 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_@flink.scala.version@</artifactId>
+          <artifactId>beam-runners-flink_2.10</artifactId>
           <version>${beam.version}</version>
           <scope>runtime</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/beam/blob/e1548435/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 59bd5c2..b8b9c9f 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_@flink.scala.version@</artifactId>
+          <artifactId>beam-runners-flink_2.10</artifactId>
           <version>${beam.version}</version>
           <scope>runtime</scope>
         </dependency>


Mime
View raw message