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 2017/05/05 23:17:48 UTC
[1/3] beam git commit: [BEAM-806] Use filtering for the version of
the reference test project
Repository: beam
Updated Branches:
refs/heads/master 5ce3adf9e -> 060889701
[BEAM-806] Use filtering for the version of the reference test project
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4675f380
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4675f380
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4675f380
Branch: refs/heads/master
Commit: 4675f3805e5d0ff93d33a3fcaf48737eb349cfc0
Parents: 5ce3adf
Author: Elek, Márton <el...@users.noreply.github.com>
Authored: Fri May 5 16:11:08 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Fri May 5 16:17:14 2017 -0700
----------------------------------------------------------------------
sdks/java/maven-archetypes/pom.xml | 8 +++++++-
.../src/test/resources/projects/basic/reference/pom.xml | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/4675f380/sdks/java/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
index 7bafefc..08be5b2 100644
--- a/sdks/java/maven-archetypes/pom.xml
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -54,7 +54,13 @@
</excludes>
</resource>
</resources>
-
+ <!-- needed to replace version in the reference projects -->
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
<pluginManagement>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/beam/blob/4675f380/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 bf38cf3..39fefd6 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
@@ -25,7 +25,7 @@
<version>0.1</version>
<properties>
- <beam.version>2.1.0-SNAPSHOT</beam.version>
+ <beam.version>@project.version@</beam.version>
</properties>
<repositories>
[2/3] beam git commit: PR polish: move testResources section from
all-archetypes level to starter-archetype level
Posted by da...@apache.org.
PR polish: move testResources section from all-archetypes level to starter-archetype level
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1aaca2bf
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1aaca2bf
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1aaca2bf
Branch: refs/heads/master
Commit: 1aaca2bf0273287831f673b1b22dd16bfb94878d
Parents: 4675f38
Author: Davor Bonaci <da...@google.com>
Authored: Fri May 5 16:14:07 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Fri May 5 16:17:28 2017 -0700
----------------------------------------------------------------------
sdks/java/maven-archetypes/pom.xml | 9 ++-------
sdks/java/maven-archetypes/starter/pom.xml | 8 ++++++++
2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/1aaca2bf/sdks/java/maven-archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
index 08be5b2..0a37c52 100644
--- a/sdks/java/maven-archetypes/pom.xml
+++ b/sdks/java/maven-archetypes/pom.xml
@@ -54,13 +54,7 @@
</excludes>
</resource>
</resources>
- <!-- needed to replace version in the reference projects -->
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
+
<pluginManagement>
<plugins>
<plugin>
@@ -76,6 +70,7 @@
</plugins>
</pluginManagement>
</build>
+
<profiles>
<!--
The builds for the example archetypes use unix scripting, so are enabled only on
http://git-wip-us.apache.org/repos/asf/beam/blob/1aaca2bf/sdks/java/maven-archetypes/starter/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/maven-archetypes/starter/pom.xml b/sdks/java/maven-archetypes/starter/pom.xml
index 17ed0de..06b41c8 100644
--- a/sdks/java/maven-archetypes/starter/pom.xml
+++ b/sdks/java/maven-archetypes/starter/pom.xml
@@ -42,6 +42,14 @@
</extension>
</extensions>
+ <!-- Needed to replace version in the reference projects. -->
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ </testResources>
+
<pluginManagement>
<plugins>
<plugin>
[3/3] beam git commit: This closes #2911
Posted by da...@apache.org.
This closes #2911
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/06088970
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/06088970
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/06088970
Branch: refs/heads/master
Commit: 060889701341b2218390a9998c414ad02a09cab7
Parents: 5ce3adf 1aaca2b
Author: Davor Bonaci <da...@google.com>
Authored: Fri May 5 16:17:43 2017 -0700
Committer: Davor Bonaci <da...@google.com>
Committed: Fri May 5 16:17:43 2017 -0700
----------------------------------------------------------------------
sdks/java/maven-archetypes/pom.xml | 1 +
sdks/java/maven-archetypes/starter/pom.xml | 8 ++++++++
.../src/test/resources/projects/basic/reference/pom.xml | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------