From 2620d496db9adde87d1c21ed541dea992826f232 Mon Sep 17 00:00:00 2001 From: Davor Bonaci Date: Thu, 2 Feb 2017 13:47:00 -0800 Subject: [PATCH 1/2] Update archetype versioning in the release branch for 2.0.0-beta2 --- .../examples/src/main/resources/archetype-resources/pom.xml | 2 +- .../starter/src/main/resources/archetype-resources/pom.xml | 2 +- .../starter/src/test/resources/projects/basic/reference/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml index c5e16cd789..a86c1d2f92 100644 --- a/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml @@ -125,7 +125,7 @@ com.google.cloud.dataflow google-cloud-dataflow-java-sdk-all - 2.0.0-beta2-SNAPSHOT + 2.0.0-beta2 diff --git a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml index a73e9db9ed..9ca8d091c9 100644 --- a/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml +++ b/maven-archetypes/starter/src/main/resources/archetype-resources/pom.xml @@ -74,7 +74,7 @@ com.google.cloud.dataflow google-cloud-dataflow-java-sdk-all - 2.0.0-beta2-SNAPSHOT + 2.0.0-beta2 diff --git a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml index ea55b72c91..80fe5d61d2 100644 --- a/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml +++ b/maven-archetypes/starter/src/test/resources/projects/basic/reference/pom.xml @@ -74,7 +74,7 @@ com.google.cloud.dataflow google-cloud-dataflow-java-sdk-all - 2.0.0-beta2-SNAPSHOT + 2.0.0-beta2 From bc09ed5ddeeab60d5c63651f6b4c3536007c003b Mon Sep 17 00:00:00 2001 From: Davor Bonaci Date: Thu, 2 Feb 2017 13:48:22 -0800 Subject: [PATCH 2/2] Pin worker container image for the release branch --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 004a9d1269..5b489e1e33 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 0.5.0 Google Cloud Dataflow SDK for Java - ${project.version}-20170103 + ${project.version} 6