Cherry-pick pull request #2911 into release-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/d2fa51b7 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d2fa51b7 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d2fa51b7 Branch: refs/heads/release-2.0.0 Commit: d2fa51b78892f7ebf13da1a5fc7bb45755440a5f Parents: b9c8cfe Author: Davor Bonaci <[email protected]> Authored: Fri May 5 16:17:43 2017 -0700 Committer: Dan Halperin <[email protected]> Committed: Fri May 5 17:26:24 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/d2fa51b7/sdks/java/maven-archetypes/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml index 1342fd2..5c413a0 100644 --- a/sdks/java/maven-archetypes/pom.xml +++ b/sdks/java/maven-archetypes/pom.xml @@ -70,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/d2fa51b7/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 c27597e..0b2c98a 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> http://git-wip-us.apache.org/repos/asf/beam/blob/d2fa51b7/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 1c9847a..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>0.7.0-SNAPSHOT</beam.version> + <beam.version>@project.version@</beam.version> </properties> <repositories>
