You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by da...@apache.org on 2016/12/09 22:44:02 UTC
[1/2] incubator-beam git commit: Copy Runner Profiles to Java8
Archetype POM
Repository: incubator-beam
Updated Branches:
refs/heads/master 58bb1174d -> 05bb254b8
Copy Runner Profiles to Java8 Archetype POM
This enables Java8 examples to be run cross-runner
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/65dd62cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/65dd62cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/65dd62cd
Branch: refs/heads/master
Commit: 65dd62cd9b1d6f7925ee60b73a5a3fac1e4b1bf1
Parents: 58bb117
Author: Thomas Groh <tg...@google.com>
Authored: Fri Dec 9 11:36:22 2016 -0800
Committer: Thomas Groh <tg...@google.com>
Committed: Fri Dec 9 14:33:46 2016 -0800
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 116 ++++++++++++++++---
1 file changed, 101 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/65dd62cd/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 ece8412..693850a 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
@@ -26,6 +26,10 @@
<packaging>jar</packaging>
+ <properties>
+ <beam.version>0.4.0-incubating-SNAPSHOT</beam.version>
+ </properties>
+
<build>
<plugins>
<plugin>
@@ -71,6 +75,103 @@
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>direct-runner</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <!-- Makes the DirectRunner available when running a pipeline. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-direct-java</artifactId>
+ <version>${beam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>apex-runner</id>
+ <!-- Makes the ApexRunner available when running a pipeline. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-apex</artifactId>
+ <version>${beam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>dataflow-runner</id>
+ <!-- Makes the DataflowRunner available when running a pipeline. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-google-cloud-dataflow-java</artifactId>
+ <version>${beam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>flink-runner</id>
+ <!-- Makes the FlinkRunner available when running a pipeline. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-flink_2.10</artifactId>
+ <version>${beam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>spark-runner</id>
+ <!-- Makes the SparkRunner available when running a pipeline. Additionally,
+ overrides some Spark dependencies to Beam-compatible versions. -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-spark</artifactId>
+ <version>${beam.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.spark</groupId>
+ <artifactId>spark-streaming_2.10</artifactId>
+ <version>1.6.2</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-scala_2.10</artifactId>
+ <version>2.7.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<!-- Adds a dependency on a specific version of the Beam SDK. -->
<dependency>
@@ -79,21 +180,6 @@
<version>0.4.0-incubating-SNAPSHOT</version>
</dependency>
- <!-- Adds a dependency on a specific version of the Dataflow runnner. -->
- <dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-direct-java</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-google-cloud-dataflow-java</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
<!-- Adds a dependency on a specific version of the Beam Google Cloud Platform IO module. -->
<dependency>
<groupId>org.apache.beam</groupId>
[2/2] incubator-beam git commit: This closes #1567
Posted by da...@apache.org.
This closes #1567
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/05bb254b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/05bb254b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/05bb254b
Branch: refs/heads/master
Commit: 05bb254b8e64fbb2ac598ff998542c089baf37e6
Parents: 58bb117 65dd62c
Author: Davor Bonaci <da...@google.com>
Authored: Fri Dec 9 14:43:49 2016 -0800
Committer: Davor Bonaci <da...@google.com>
Committed: Fri Dec 9 14:43:49 2016 -0800
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 116 ++++++++++++++++---
1 file changed, 101 insertions(+), 15 deletions(-)
----------------------------------------------------------------------