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

Commit f671e6a

Browse files
jasonkusterdhalperi
authored andcommitted
Update versioning after cutting 2.0.0 release branch. (#574)
* Update archetype versioning after cutting 2.0.0 release branch. Signed-off-by: Jason Kuster <[email protected]> * Update worker container image for 2.1.0-SNAPSHOT. Signed-off-by: Jason Kuster <[email protected]> * Pin all versions to project version. Signed-off-by: Jason Kuster <[email protected]>
1 parent d405557 commit f671e6a

File tree

4 files changed

+4
-11
lines changed
  • maven-archetypes
    • examples-java8/src/main/resources/archetype-resources
    • examples/src/main/resources/archetype-resources
    • starter/src/main/resources/archetype-resources

4 files changed

+4
-11
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
@@ -136,7 +136,7 @@
136136
<dependency>
137137
<groupId>com.google.cloud.dataflow</groupId>
138138
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
139-
<version>@archetype.sdk_version_dependency@</version>
139+
<version>@project.version@</version>
140140
</dependency>
141141

142142
<!-- 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
@@ -136,7 +136,7 @@
136136
<dependency>
137137
<groupId>com.google.cloud.dataflow</groupId>
138138
<artifactId>google-cloud-dataflow-java-sdk-all</artifactId>
139-
<version>@archetype.sdk_version_dependency@</version>
139+
<version>@project.version@</version>
140140
</dependency>
141141

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

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>@archetype.sdk_version_dependency@</version>
75+
<version>@project.version@</version>
7676
</dependency>
7777

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

pom.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,8 @@
106106
<beam.version>2.0.0</beam.version>
107107

108108
<dataflow.release_name>Google Cloud Dataflow SDK for Java</dataflow.release_name>
109-
<dataflow.container_version>${project.version}-20170317</dataflow.container_version>
109+
<dataflow.container_version>${project.version}-20170517</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>
118111
</properties>
119112

120113
<packaging>pom</packaging>

0 commit comments

Comments
 (0)