From 48c14b32da13cb4a7c441f1354a438d78b9df862 Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Wed, 29 Apr 2020 16:59:27 +0200
Subject: [PATCH] Fix Spring Cloud Dependencies version in standalone samples.

---
 samples/standalone/contracts/com/example/server/pom.xml    | 2 +-
 samples/standalone/dsl/http-client/gradle.properties       | 2 +-
 samples/standalone/dsl/http-client/pom.xml                 | 3 +--
 samples/standalone/dsl/http-server/gradle.properties       | 2 +-
 samples/standalone/dsl/http-server/pom.xml                 | 6 +++---
 samples/standalone/restdocs/http-client/gradle.properties  | 2 +-
 samples/standalone/restdocs/http-server/gradle.properties  | 2 +-
 samples/standalone/webclient/http-client/gradle.properties | 2 +-
 samples/standalone/webclient/http-server/gradle.properties | 2 +-
 9 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml
index d9536276f1..02c69e9869 100644
--- a/samples/standalone/contracts/com/example/server/pom.xml
+++ b/samples/standalone/contracts/com/example/server/pom.xml
@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud-contract.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2020-1.BUILD-SNAPSHOT</spring-cloud-release.version>
+		<spring-cloud-release.version>2020.0.0-SNAPSHOT</spring-cloud-release.version>
 		<excludeBuildFolders>true</excludeBuildFolders>
 	</properties>
 
diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties
index c8ff9f0547..57f4854e3e 100644
--- a/samples/standalone/dsl/http-client/gradle.properties
+++ b/samples/standalone/dsl/http-client/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=false
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml
index df3d1de698..cacbb24bda 100644
--- a/samples/standalone/dsl/http-client/pom.xml
+++ b/samples/standalone/dsl/http-client/pom.xml
@@ -21,8 +21,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-release-train.version>2020-1.BUILD-SNAPSHOT
-		</spring-cloud-release-train.version>
+		<spring-cloud-release-train.version>2020.0.0-SNAPSHOT</spring-cloud-release-train.version>
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties
index d4a1ba0239..343dc24c07 100644
--- a/samples/standalone/dsl/http-server/gradle.properties
+++ b/samples/standalone/dsl/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.0.BUILD-SNAPSHOT
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file
diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml
index 7d5194e96e..695502256e 100644
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -21,9 +21,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud-contract.version>3.0.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
-		<spring-cloud-release.version>2020-1.BUILD-SNAPSHOT
-		</spring-cloud-release.version>
+		<spring-cloud-contract.version>3.0.0.BUILD-SNAPSHOT
+		</spring-cloud-contract.version>
+		<spring-cloud-release.version>2020.0.0-SNAPSHOT</spring-cloud-release.version>
 	</properties>
 
 	<dependencies>
diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties
index d4a1ba0239..343dc24c07 100644
--- a/samples/standalone/restdocs/http-client/gradle.properties
+++ b/samples/standalone/restdocs/http-client/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.0.BUILD-SNAPSHOT
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file
diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties
index d4a1ba0239..343dc24c07 100644
--- a/samples/standalone/restdocs/http-server/gradle.properties
+++ b/samples/standalone/restdocs/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.0.BUILD-SNAPSHOT
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file
diff --git a/samples/standalone/webclient/http-client/gradle.properties b/samples/standalone/webclient/http-client/gradle.properties
index d4a1ba0239..343dc24c07 100644
--- a/samples/standalone/webclient/http-client/gradle.properties
+++ b/samples/standalone/webclient/http-client/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.0.BUILD-SNAPSHOT
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file
diff --git a/samples/standalone/webclient/http-server/gradle.properties b/samples/standalone/webclient/http-server/gradle.properties
index d4a1ba0239..343dc24c07 100644
--- a/samples/standalone/webclient/http-server/gradle.properties
+++ b/samples/standalone/webclient/http-server/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.daemon=false
 verifierVersion=3.0.0.BUILD-SNAPSHOT
-BOM_VERSION=2020-1.BUILD-SNAPSHOT
+BOM_VERSION=2020.0.0-SNAPSHOT
 bootVersion=2.3.0.M4
\ No newline at end of file