From 8b3cac77b0629d5a1b9c3434a0f8b4c728c6fcef Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@gmail.com>
Date: Thu, 4 Jun 2020 13:28:30 +0200
Subject: [PATCH] Migrated to docs.spring.io & updated sc-build

---
 README.adoc                              |  8 +++++++-
 docs/pom.xml                             | 15 ++++-----------
 docs/src/main/asciidoc/_configprops.adoc |  2 +-
 pom.xml                                  |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/README.adoc b/README.adoc
index 55d3748..c0d710c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -4,6 +4,7 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////
 
+
 = Spring Cloud for Cloudfoundry
 
 image:https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry"]
@@ -96,6 +97,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.
 
+==== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
 ==== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
@@ -303,4 +309,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
 
-IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
\ No newline at end of file
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
diff --git a/docs/pom.xml b/docs/pom.xml
index 2a9ffaf..d778b03 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -15,8 +15,8 @@
 	<properties>
 		<docs.main>spring-cloud-cloudfoundry</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<configprops.inclusionPattern>spring.cloud.cloudfoundry.*</configprops.inclusionPattern>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -36,16 +36,6 @@
 			<artifactId>spring-cloud-cloudfoundry-discovery</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
@@ -75,6 +65,9 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index d3b11db..51df093 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -15,4 +15,4 @@
 |spring.cloud.cloudfoundry.url |  | URL of Cloud Foundry API (Cloud Controller).
 |spring.cloud.cloudfoundry.username |  | Username to authenticate (usually an email address).
 
-|===
+|===
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 73b8cd9..77263cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.3.0.RELEASE</version>
+		<version>2.3.1.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>