Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Commit 8038423

Browse files
authored
Merge pull request #566 from davorbonaci/arch-versions
Archetypes: version management at the top-level outside archetype source code
2 parents 328a0d4 + 0e93387 commit 8038423

File tree

5 files changed

+50
-3
lines changed
  • maven-archetypes
    • examples-java8/src/main/resources/archetype-resources
    • examples/src/main/resources/archetype-resources
    • starter/src/main/resources/archetype-resources

5 files changed

+50
-3
lines changed

maven-archetypes/examples-java8/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>com.google.cloud.dataflow</groupId>
130130
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
131-
<version>2.0.0-beta4-SNAPSHOT</version>
131+
<version>@archetype.sdk_version_dependency@</version>
132132
</dependency>
133133

134134
<!-- Dependencies below this line are specific dependencies needed by the examples code. -->

maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>com.google.cloud.dataflow</groupId>
130130
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
131-
<version>2.0.0-beta4-SNAPSHOT</version>
131+
<version>@archetype.sdk_version_dependency@</version>
132132
</dependency>
133133

134134
<!-- Dependencies below this line are specific dependencies needed by the examples code. -->

maven-archetypes/pom.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,38 @@
3535
<module>examples</module>
3636
<module>examples-java8</module>
3737
</modules>
38+
39+
<build>
40+
<pluginManagement>
41+
<plugins>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-resources-plugin</artifactId>
45+
<configuration>
46+
<delimiters>
47+
<delimiter>@</delimiter>
48+
</delimiters>
49+
<useDefaultDelimiters>false</useDefaultDelimiters>
50+
</configuration>
51+
</plugin>
52+
</plugins>
53+
</pluginManagement>
54+
55+
<resources>
56+
<resource>
57+
<directory>src/main/resources</directory>
58+
<filtering>true</filtering>
59+
<includes>
60+
<include>archetype-resources/pom.xml</include>
61+
</includes>
62+
</resource>
63+
<resource>
64+
<directory>src/main/resources</directory>
65+
<filtering>false</filtering>
66+
<excludes>
67+
<exclude>archetype-resources/pom.xml</exclude>
68+
</excludes>
69+
</resource>
70+
</resources>
71+
</build>
3872
</project>

maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.cloud.dataflow</groupId>
7474
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
75-
<version>2.0.0-beta4-SNAPSHOT</version>
75+
<version>@archetype.sdk_version_dependency@</version>
7676
</dependency>
7777

7878
<!-- slf4j API frontend binding with JUL backend -->

pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@
108108
<dataflow.release_name>Google Cloud Dataflow SDK for Java</dataflow.release_name>
109109
<dataflow.container_version>${project.version}-20170317</dataflow.container_version>
110110
<dataflow.environment_major_version>6</dataflow.environment_major_version>
111+
112+
<!-- Archetype version propagated automatically to underlying archetype modules.
113+
Example values are: ${project.version}, 1.2.3-SNAPSHOT, [1.0.0,2),
114+
[${project.version}, 2), etc.
115+
Starter archetype reference copy isn't affected by this value; a manual
116+
change is expected there. -->
117+
<archetype.sdk_version_dependency>2.0.0-beta4-SNAPSHOT</archetype.sdk_version_dependency>
111118
</properties>
112119

113120
<packaging>pom</packaging>
@@ -262,6 +269,12 @@
262269
</executions>
263270
</plugin>
264271

272+
<plugin>
273+
<groupId>org.apache.maven.plugins</groupId>
274+
<artifactId>maven-resources-plugin</artifactId>
275+
<version>3.0.2</version>
276+
</plugin>
277+
265278
<plugin>
266279
<groupId>org.apache.maven.plugins</groupId>
267280
<artifactId>maven-dependency-plugin</artifactId>

0 commit comments

Comments
 (0)