This closes apache#2737

mransley · May 2, 2017 · ccbb00e · ccbb00e
2 parents 986d727 + 403a64b
commit ccbb00e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -141,6 +141,7 @@
  <groovy-maven-plugin.version>2.0</groovy-maven-plugin.version>
  <surefire-plugin.version>2.20</surefire-plugin.version>
  <failsafe-plugin.version>2.20</failsafe-plugin.version>
+ <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
 
  <compiler.error.flag>-Werror</compiler.error.flag>
  <compiler.default.pkginfo.flag>-Xpkginfo:always</compiler.default.pkginfo.flag>
@@ -216,6 +217,11 @@
  </execution>
  </executions>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>${maven-resources-plugin.version}</version>
+ </plugin>
  </plugins>
  </pluginManagement>
 

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
@@ -27,7 +27,7 @@
  <packaging>jar</packaging>
 
  <properties>
- <beam.version>0.7.0-SNAPSHOT</beam.version>
+ <beam.version>@project.version@</beam.version>
  <surefire-plugin.version>2.20</surefire-plugin.version>
  </properties>
 
@@ -224,7 +224,7 @@
  <dependency>
  <groupId>com.fasterxml.jackson.module</groupId>
  <artifactId>jackson-module-scala_2.10</artifactId>
- <version>2.7.2</version>
+ <version>@jackson.version@</version>
  <scope>runtime</scope>
  </dependency>
  </dependencies>

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
@@ -27,7 +27,7 @@
  <packaging>jar</packaging>
 
  <properties>
- <beam.version>0.7.0-SNAPSHOT</beam.version>
+ <beam.version>@project.version@</beam.version>
  <surefire-plugin.version>2.20</surefire-plugin.version>
  </properties>
 
@@ -224,7 +224,7 @@
  <dependency>
  <groupId>com.fasterxml.jackson.module</groupId>
  <artifactId>jackson-module-scala_2.10</artifactId>
- <version>2.7.2</version>
+ <version>@jackson.version@</version>
  <scope>runtime</scope>
  </dependency>
  </dependencies>

diff --git a/sdks/java/maven-archetypes/pom.xml b/sdks/java/maven-archetypes/pom.xml
@@ -35,6 +35,41 @@
  <module>starter</module>
  </modules>
 
+ <build>
+ <resources>
+ <!-- use filtering for the pom.xml template (with custom delimiter, see bellow) -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>archetype-resources/pom.xml</include>
+ </includes>
+ </resource>
+ <!-- all of the other resources file should be used as resource but without filtering -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>archetype-resources/pom.xml</exclude>
+ </excludes>
+ </resource>
+ </resources>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <delimiters>
+ <delimiter>@</delimiter>
+ </delimiters>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
  <profiles>
  <!--
  The builds for the example archetypes use unix scripting, so are enabled only on

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
@@ -25,7 +25,7 @@
  <version>${version}</version>
 
  <properties>
- <beam.version>0.7.0-SNAPSHOT</beam.version>
+ <beam.version>@project.version@</beam.version>
  </properties>
 
  <repositories>