From d885a49ddd902ec45c832253b31d17ff7fd2008d Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 23 Jul 2019 11:04:03 +0000
Subject: [PATCH] Bumping versions

---
 README.adoc                                                 | 5 ++++-
 .../gs-contract-rest/complete/contract-rest-client/pom.xml  | 2 +-
 .../gs-contract-rest/complete/contract-rest-service/pom.xml | 6 +++---
 .../gs-contract-rest/initial/contract-rest-client/pom.xml   | 2 +-
 .../gs-contract-rest/initial/contract-rest-service/pom.xml  | 6 +++---
 .../src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml | 2 +-
 docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml     | 5 ++---
 .../spring-cloud-stream-binder-test/pom.xml                 | 2 +-
 .../spring-cloud-stream-integration-tests/pom.xml           | 2 +-
 .../spring-cloud-stream-reactive/pom.xml                    | 2 +-
 .../spring-cloud-stream-schema-server/pom.xml               | 2 +-
 .../spring-cloud-stream/spring-cloud-stream-schema/pom.xml  | 2 +-
 .../spring-cloud-stream-test-support-internal/pom.xml       | 2 +-
 .../spring-cloud-stream-test-support/pom.xml                | 2 +-
 .../spring-cloud-stream/spring-cloud-stream-tools/pom.xml   | 2 +-
 .../spring-cloud-stream/spring-cloud-stream/pom.xml         | 2 +-
 pom.xml                                                     | 2 +-
 spring-cloud-build-dependencies/pom.xml                     | 4 ++--
 18 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/README.adoc b/README.adoc
index 070625ee..60a37926 100644
--- a/README.adoc
+++ b/README.adoc
@@ -179,6 +179,7 @@ $ touch .springformat
 ==== Intellij IDEA
 
 In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
 
 .spring-cloud-build-tools/
 ----
@@ -294,4 +295,6 @@ $ ./mvnw clean deploy -Pguides
 
 what will happen is that for GA project versions, we will clone `gs-guide1`, `gs-guide2` and `gs-guide3` and update their contents with the ones being under your `guides` project.
 
-You can skip this by either not adding the `guides` profile, or passing the `-DskipGuides` system property when the profile is turned on.
\ No newline at end of file
+You can skip this by either not adding the `guides` profile, or passing the `-DskipGuides` system property when the profile is turned on.
+
+You can configure the project version passed to guides via the `guides-project.version` (defaults to `${project.version}`). The phase at which guides get updated can be configured by `guides-update.phase` (defaults to `deploy`).
\ No newline at end of file
diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml
index 77f7e96a..ea3072a7 100644
--- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml
index 432772db..e14670bc 100644
--- a/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
-		<spring-cloud-contract.version>2.0.2.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
 	<dependencies>
diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml
index 77f7e96a..ea3072a7 100644
--- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-client/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml
index 5e796e3d..b475c99b 100644
--- a/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml
+++ b/docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml
@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.4.RELEASE</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Finchley.SR2</spring-cloud.version>
-		<spring-cloud-contract.version>2.0.2.RELEASE</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
 	<dependencies>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml
index 39d84f49..0f5e1cf4 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/docs/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml
index 8696ff67..7c9595ca 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.4.BUILD-SNAPSHOT</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,8 +28,7 @@
 		<reactor.version>Californium-SR5</reactor.version>
 		<kryo-shaded.version>3.0.3</kryo-shaded.version>
 		<objenesis.version>2.1</objenesis.version>
-		<spring-cloud-function.version>2.1.0.M1
-		</spring-cloud-function.version>
+		<spring-cloud-function.version>2.1.1.BUILD-SNAPSHOT</spring-cloud-function.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml
index 154ed845..29112435 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-binder-test/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml
index afa33f28..e2154bbc 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml
index 4566fbcb..a8e673a6 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-reactive/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml
index 24906e09..1384f6e9 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml
index 84f04ba5..3754c95f 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-schema/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml
index db2c08e2..2daf716a 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support-internal/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml
index ddcf23c5..a0688bae 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-test-support/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml
index d371cd7e..d2b13807 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>2.1.4.BUILD-SNAPSHOT</version>
+        <version>2.2.0.BUILD-SNAPSHOT</version>
         <relativePath />
     </parent>
 
diff --git a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml
index b1c5dc0d..6c7f66db 100644
--- a/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml
+++ b/docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>Horsham.BUILD-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/pom.xml b/pom.xml
index 771ca0ac..ffef567c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.2.0.M4</spring-boot.version>
+		<spring-boot.version>2.2.0.BUILD-SNAPSHOT</spring-boot.version>
 		<spring-cloud-build.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index fd9cfd42..6973b120 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/spring-cloud-build-dependencies/pom.xml
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.0.M4</version>
+		<version>2.2.0.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.0.M4</spring-boot.version>
+		<spring-boot.version>2.2.0.BUILD-SNAPSHOT</spring-boot.version>
 	</properties>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>