You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/12/13 19:57:13 UTC
[1/2] incubator-beam git commit: Closes #1596
Repository: incubator-beam
Updated Branches:
refs/heads/master cd8eeea95 -> 2e22a4875
Closes #1596
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/2e22a487
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/2e22a487
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/2e22a487
Branch: refs/heads/master
Commit: 2e22a4875129ad7c8afef2c441954156cfdf8125
Parents: cd8eeea 6c8d93b
Author: Dan Halperin <dh...@google.com>
Authored: Tue Dec 13 11:56:59 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Dec 13 11:56:59 2016 -0800
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 16 +++++++++++++---
.../test/resources/projects/basic/reference/pom.xml | 16 +++++++++++++---
2 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-beam git commit: [BEAM-909] improve starter archetype
Posted by dh...@apache.org.
[BEAM-909] improve starter archetype
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6c8d93b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6c8d93b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6c8d93b0
Branch: refs/heads/master
Commit: 6c8d93b018a040591b58e8f38d2a2442a7589692
Parents: cd8eeea
Author: Dan Halperin <dh...@google.com>
Authored: Tue Dec 13 09:50:33 2016 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Dec 13 11:56:59 2016 -0800
----------------------------------------------------------------------
.../src/main/resources/archetype-resources/pom.xml | 16 +++++++++++++---
.../test/resources/projects/basic/reference/pom.xml | 16 +++++++++++++---
2 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c8d93b0/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
index 4fae02c..efafeca 100644
--- a/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml
@@ -24,6 +24,10 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
+ <properties>
+ <beam.version>0.4.0-incubating-SNAPSHOT</beam.version>
+ </properties>
+
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -69,14 +73,20 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-core</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
+ <version>${beam.version}</version>
</dependency>
- <!-- Adds a dependency on the Beam direct runner. -->
+ <!--
+ By default, the starter project has a dependency on the Beam DirectRunner
+ to enable development and testing of pipelines. To run on another of the
+ Beam runners, add its module to this pom.xml according to the
+ runner-specific setup instructions on the Beam website:
+ http://beam.incubator.apache.org/documentation/#runners
+ -->
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-direct-java</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
+ <version>${beam.version}</version>
<scope>runtime</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c8d93b0/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
index 4656e63..a86bd11 100644
--- a/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
+++ b/sdks/java/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml
@@ -24,6 +24,10 @@
<artifactId>basic</artifactId>
<version>0.1</version>
+ <properties>
+ <beam.version>0.4.0-incubating-SNAPSHOT</beam.version>
+ </properties>
+
<repositories>
<repository>
<id>apache.snapshots</id>
@@ -69,14 +73,20 @@
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-core</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
+ <version>${beam.version}</version>
</dependency>
- <!-- Adds a dependency on the Beam direct runner. -->
+ <!--
+ By default, the starter project has a dependency on the Beam DirectRunner
+ to enable development and testing of pipelines. To run on another of the
+ Beam runners, add its module to this pom.xml according to the
+ runner-specific setup instructions on the Beam website:
+ http://beam.incubator.apache.org/documentation/#runners
+ -->
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-direct-java</artifactId>
- <version>0.4.0-incubating-SNAPSHOT</version>
+ <version>${beam.version}</version>
<scope>runtime</scope>
</dependency>