Update SNAPSHOT to 3.0.0-M2

Fixes gh-159

.circleci/config.yml

@@ -10,7 +10,6 @@ jobs:
     branches:
       ignore:
         - gh-pages # list of branches to ignore
-    resource_class: large
     steps:
       - checkout
       - restore_cache:

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. 
+
+**Sample**
+If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -19,3 +19,4 @@ _site/
 .vscode/
 .flattened-pom.xml
 .DS_Store
+.sdkmanrc

README.adoc

@@ -226,6 +226,24 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t
 
 IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
 
+== Flattening the POMs
+
+To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+
+In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
+
+[source,xml]
+----
+<build>
+	<plugins>
+		<plugin>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>flatten-maven-plugin</artifactId>
+		</plugin>
+	</plugins>
+</build>
+----
+
 == Reusing the documentation
 
 Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
@@ -235,46 +253,54 @@ approach of generating documentation just add these plugins to your `docs` modul
 
 [source,xml]
 ----
+<properties>
+	<upload-docs-zip.phase>deploy</upload-docs-zip.phase> <8>
+</properties>
 <profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId> <1>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId> <3>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId> <4>
-					</plugin>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <5>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <6>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+	<profile>
+		<id>docs</id>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId> <1>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId> <2>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId> <3>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId> <4>
+				</plugin>
+				<plugin>
+					<groupId>org.asciidoctor</groupId>
+					<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId> <6>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId> <7>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
+<1> This plugin downloads sets up all the git information of the project
 <2> This plugin downloads the resources of the `spring-cloud-build-docs` module
 <3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<7> This plugin ensures that the generated zip docs will get published
+<8> This property turns on the "deploy" phase for <7>
 
 IMPORTANT: The order of plugin declaration is important!
 
@@ -293,35 +319,36 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 	<toc>left</toc>
 	<toc-levels>4</toc-levels>
 	<sectlinks>true</sectlinks>
-	<sources-root>${project.basedir}/src</sources-root>
-	<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-	<generated-resources-root>${project.basedir}/target/generated-resources
+	<sources-root>${project.basedir}/src@</sources-root>
+	<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
+	<generated-resources-root>${project.basedir}/target/generated-resources@
 	</generated-resources-root>
 	<!-- Use this attribute the reference code from another module -->
-	<project-root>${maven.multiModuleProjectDirectory}</project-root>
+	<!-- Note the @ at the end, lowering the precedence of the attribute -->
+	<project-root>${maven.multiModuleProjectDirectory}@</project-root>
 	<!-- It's mandatory for you to pass the docs.main property -->
-	<github-repo>${docs.main}</github-repo>
+	<github-repo>${docs.main}@</github-repo>
 	<github-raw>
-		https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
+		https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
 	</github-raw>
-	<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
+	<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
 	</github-code>
-	<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-	<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-	<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
+	<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
+	<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
+	<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
 	</github-master-code>
-	<index-link>${index-link}</index-link>
+	<index-link>${index-link}@</index-link>
 
 	<!-- Spring Cloud specific -->
 	<!-- for backward compatibility -->
-	<spring-cloud-version>${project.version}</spring-cloud-version>
-	<project-version>${project.version}</project-version>
-	<github-tag>${github-tag}</github-tag>
-	<version-type>${version-type}</version-type>
-	<docs-url>${docs-url}</docs-url>
-	<raw-docs-url>${raw-docs-url}</raw-docs-url>
-	<project-version>${project.version}</project-version>
-	<project-name>${docs.main}</project-name>
+	<spring-cloud-version>${project.version}@</spring-cloud-version>
+	<project-version>${project.version}@</project-version>
+	<github-tag>${github-tag}@</github-tag>
+	<version-type>${version-type}@</version-type>
+	<docs-url>https://docs.spring.io/${docs.main}/docs/${project.version}@</docs-url>
+	<raw-docs-url>${github-raw}@</raw-docs-url>
+	<project-version>${project.version}@</project-version>
+	<project-name>${docs.main}@</project-name>
 </attributes>
 ----
 
@@ -332,9 +359,9 @@ We assume that your project contains guides under the `guides` folder.
 ```
 .
 └── guides
-    ├── gs-guide1
-    ├── gs-guide2
-    └── gs-guide3
+	├── gs-guide1
+	├── gs-guide2
+	└── gs-guide3
 ```
 
 This means that the project contains 3 guides that would

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.

config/releaser.yml

@@ -0,0 +1,4 @@
+releaser:
+  maven:
+    buildCommand: ./scripts/build.sh  {{systemProps}}
+#    deployCommand: echo "skip deploy"

docs/pom.xml

@@ -10,14 +10,17 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M5</version>
+		<version>3.0.0-M2</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
-		<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x,2.1.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
-		<gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version>
+		<!-- We don't want to downloaded sources of our own project-->
+		<maven-dependency-plugin-for-docs.phase>none</maven-dependency-plugin-for-docs.phase>
+		<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
 	</properties>
 	<dependencies>
 		<!-- Script -->
@@ -33,23 +36,8 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-xml</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-nio</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-json</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -63,43 +51,11 @@
 			<resource>
 				<directory>src/main</directory>
 				<excludes>
-					<exclude>groovy/**/*.*</exclude>
+					<exclude>java/**/*.*</exclude>
 				</excludes>
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${build-helper-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/main/groovy</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.gmavenplus</groupId>
-				<artifactId>gmavenplus-plugin</artifactId>
-				<version>${gmavenplus-plugin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal>
-							<goal>addSources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8.2</version>
@@ -135,6 +91,13 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<goals>
+							<goal>deploy</goal>
+							<goal>deploy-file</goal>
+						</goals>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -160,7 +123,6 @@
 								</goals>
 								<configuration>
 									<skip>${skipTests}</skip>
-									<!-- <skip>true</skip> -->
 									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
 								</configuration>
 							</execution>

docs/src/main/.gitignore

@@ -0,0 +1,2 @@
+META-INF/
+org/

docs/src/main/asciidoc/README.adoc

@@ -42,6 +42,24 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
 
 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
 
+== Flattening the POMs
+
+To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+
+In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
+
+[source,xml]
+----
+<build>
+	<plugins>
+		<plugin>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>flatten-maven-plugin</artifactId>
+		</plugin>
+	</plugins>
+</build>
+----
+
 == Reusing the documentation
 
 Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
@@ -51,46 +69,54 @@ approach of generating documentation just add these plugins to your `docs` modul
 
 [source,xml]
 ----
+<properties>
+	<upload-docs-zip.phase>deploy</upload-docs-zip.phase> <8>
+</properties>
 <profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId> <1>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId> <3>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId> <4>
-					</plugin>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <5>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <6>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+	<profile>
+		<id>docs</id>
+		<build>
+			<plugins>
+				<plugin>
+					<groupId>pl.project13.maven</groupId>
+					<artifactId>git-commit-id-plugin</artifactId> <1>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-dependency-plugin</artifactId> <2>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId> <3>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId> <4>
+				</plugin>
+				<plugin>
+					<groupId>org.asciidoctor</groupId>
+					<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId> <6>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId> <7>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
+<1> This plugin downloads sets up all the git information of the project
 <2> This plugin downloads the resources of the `spring-cloud-build-docs` module
 <3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
 <4> This plugin generates an `adoc` file with all the configuration properties from the classpath
 <5> This plugin is required to parse the Asciidoctor documentation
 <6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<7> This plugin ensures that the generated zip docs will get published
+<8> This property turns on the "deploy" phase for <7>
 
 IMPORTANT: The order of plugin declaration is important!
 
@@ -112,9 +138,9 @@ We assume that your project contains guides under the `guides` folder.
 ```
 .
 └── guides
-    ├── gs-guide1
-    ├── gs-guide2
-    └── gs-guide3
+	├── gs-guide1
+	├── gs-guide2
+	└── gs-guide3
 ```
 
 This means that the project contains 3 guides that would
@@ -134,4 +160,4 @@ what will happen is that for GA project versions, we will clone `gs-guide1`, `gs
 
 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`).
+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`).

docs/src/main/asciidoc/building-base.adoc

@@ -58,6 +58,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

docs/src/main/groovy/org/springframework/cloud/internal/Main.groovy

@@ -1,112 +0,0 @@
-package org.springframework.cloud.internal
-
-import java.util.regex.Pattern
-
-import groovy.json.JsonSlurper
-import groovy.transform.CompileStatic
-
-import org.springframework.core.io.Resource
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver
-
-/**
- * @author Marcin Grzejszczak
- */
-class Main {
-
-	@CompileStatic
-	static void main(String... args) {
-		String outputFile = args[0]
-		String inclusionPattern = args.length > 1 ? args[1] : ".*"
-		File parent = new File(outputFile).parentFile
-		if (!parent.exists()) {
-			println "No parent directory [${parent.toString()}] found. Won't generate the configuration properties file"
-			return
-		}
-		new Generator().generate(outputFile, inclusionPattern)
-	}
-
-	static class Generator {
-		void generate(String outputFile, String inclusionPattern) {
-			println "Parsing all configuration metadata"
-			Resource[] resources = getResources()
-			println "Found [${resources.length}] configuration metadata jsons"
-			TreeSet names = new TreeSet()
-			def descriptions = [:]
-			int count = 0
-			int matchingPropertyCount = 0
-			int propertyCount = 0
-			Pattern pattern = Pattern.compile(inclusionPattern)
-			resources.each { Resource resource ->
-				if (resourceNameContainsPattern(resource)) {
-					count++
-					def slurper = new JsonSlurper()
-					slurper.parseText(resource.inputStream.text).properties.each { val ->
-						propertyCount++
-						if (!pattern.matcher(val.name).matches()) {
-							return
-						}
-						matchingPropertyCount++
-						names.add val.name
-						descriptions[val.name] = new ConfigValue(val.name, val.description, val.defaultValue)
-					}
-				}
-			}
-			println "Found [${count}] Cloud projects configuration metadata jsons. [${matchingPropertyCount}/${propertyCount}] were matching the pattern [${inclusionPattern}]"
-			println "Successfully built the description table"
-			if (names.empty) {
-				println("Will not update the table, since no configuration properties were found!")
-				return
-			}
-			new File(outputFile).text = """\
-|===
-|Name | Default | Description
-
-${names.collect { it -> return descriptions[it] }.join("\n")}
-
-|===
-"""
-			println "Successfully stored the output file"
-		}
-
-		protected boolean resourceNameContainsPattern(Resource resource) {
-			try {
-				return resource.getURL().toString().contains("cloud")
-			}
-			catch (Exception e) {
-				println("Exception [${e}] for resource [${resource}] occurred while trying to retrieve its URL")
-				return false
-			}
-		}
-
-		protected Resource[] getResources() {
-			return new PathMatchingResourcePatternResolver()
-					.getResources("classpath*:/META-INF/spring-configuration-metadata.json")
-		}
-
-	}
-
-
-	@CompileStatic
-	static class ConfigValue {
-		String name
-		String description
-		Object defaultValue
-
-		ConfigValue() {}
-
-		ConfigValue(String name, String description, Object defaultValue) {
-			this.name = name
-			this.description = escapedValue(description)
-			this.defaultValue = escapedValue(defaultValue)
-		}
-
-		private String escapedValue(Object value) {
-			return value != null ?
-					value.toString().replaceAll('\\|', '\\\\|') : ''
-		}
-
-		String toString() {
-			"|${name} | ${defaultValue} | ${description}"
-		}
-	}
-}

docs/src/main/java/org/springframework/cloud/internal/Main.java

@@ -0,0 +1,135 @@
+package org.springframework.cloud.internal;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.util.StreamUtils;
+
+/**
+ * @author Marcin Grzejszczak
+ */
+public class Main {
+
+	public static void main(String... args) {
+		String outputFile = args[0];
+		String inclusionPattern = args.length > 1 ? args[1] : ".*";
+		File parent = new File(outputFile).getParentFile();
+		if (!parent.exists()) {
+			System.out.println("No parent directory [" + parent.toString()
+					+ "] found. Will not generate the configuration properties file");
+			return;
+		}
+		new Generator().generate(outputFile, inclusionPattern);
+	}
+
+	static class Generator {
+
+		void generate(String outputFile, String inclusionPattern) {
+			try {
+				System.out.println("Parsing all configuration metadata");
+				Resource[] resources = getResources();
+				System.out.println("Found [" + resources.length + "] configuration metadata jsons");
+				TreeSet<String> names = new TreeSet<>();
+				Map<String, ConfigValue> descriptions = new HashMap<>();
+				final AtomicInteger count = new AtomicInteger();
+				final AtomicInteger matchingPropertyCount = new AtomicInteger();
+				final AtomicInteger propertyCount = new AtomicInteger();
+				Pattern pattern = Pattern.compile(inclusionPattern);
+				for (Resource resource : resources) {
+					if (resourceNameContainsPattern(resource)) {
+						count.incrementAndGet();
+						byte[] bytes = StreamUtils.copyToByteArray(resource.getInputStream());
+						Map<String, Object> response = new ObjectMapper().readValue(bytes, HashMap.class);
+						List<Map<String, Object>> properties = (List<Map<String, Object>>) response.get("properties");
+						properties.forEach(val -> {
+							propertyCount.incrementAndGet();
+							String name = String.valueOf(val.get("name"));
+							if (!pattern.matcher(name).matches()) {
+								return;
+							}
+							String description = String.valueOf(val.get("description"));
+							Object defaultValue = val.get("defaultValue");
+							matchingPropertyCount.incrementAndGet();
+							names.add(name);
+							descriptions.put(name, new ConfigValue(name, description, defaultValue));
+						});
+					}
+				}
+				System.out.println(
+						"Found [" + count + "] Cloud projects configuration metadata jsons. [" + matchingPropertyCount
+								+ "/" + propertyCount + "] were matching the pattern [" + inclusionPattern + "]");
+				System.out.println("Successfully built the description table");
+				if (names.isEmpty()) {
+					System.out.println("Will not update the table, since no configuration properties were found!");
+					return;
+				}
+				Files.write(new File(outputFile).toPath(),
+						("|===\n"
+								+ "|Name | Default | Description\n\n" + names.stream()
+										.map(it -> descriptions.get(it).toString()).collect(Collectors.joining("\n"))
+								+ "\n\n" + "|===").getBytes());
+				System.out.println("Successfully stored the output file");
+			}
+			catch (IOException e) {
+				throw new IllegalStateException(e);
+			}
+		}
+
+		protected boolean resourceNameContainsPattern(Resource resource) {
+			try {
+				return resource.getURL().toString().contains("cloud");
+			}
+			catch (Exception e) {
+				System.out.println("Exception [" + e + "] for resource [" + resource
+						+ "] occurred while trying to retrieve its URL");
+				return false;
+			}
+		}
+
+		protected Resource[] getResources() throws IOException {
+			return new PathMatchingResourcePatternResolver()
+					.getResources("classpath*:/META-INF/spring-configuration-metadata.json");
+		}
+
+	}
+
+	static class ConfigValue {
+
+		public String name;
+
+		public String description;
+
+		public Object defaultValue;
+
+		ConfigValue() {
+		}
+
+		ConfigValue(String name, String description, Object defaultValue) {
+			this.name = name;
+			this.description = escapedValue(description);
+			this.defaultValue = escapedValue(defaultValue);
+		}
+
+		private String escapedValue(Object value) {
+			return value != null ? value.toString().replaceAll("\\|", "\\\\|") : "";
+		}
+
+		public String toString() {
+			return "|" + name + " | " + defaultValue + " | " + description;
+		}
+
+	}
+
+}

docs/src/main/ruby/generate_readme.sh

@@ -17,7 +17,10 @@ end
 file = ARGV[0] if ARGV.length>0
 
 # Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
-doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
+attributes = {}
+attributes['project-root'] = File.expand_path("#{base_dir}/../")
+
+doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: attributes
 header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
 header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
 attrs = doc.attributes

docs/src/test/bash/build-helper.sh

@@ -20,13 +20,17 @@ if [[ $# -ne 1 ]]; then
     usage
 fi
 
-SHELLCHECK_VERSION="v0.6.0"
+SHELLCHECK_VERSION="v0.7.0"
+ARCH="x86_64"
+if [ "$(uname -m)" == aarch64 ]; then
+    ARCH="aarch64"
+fi
 SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck"
 
 case $1 in
     download-shellcheck)
         if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then
-            SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz"
+            SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.${ARCH}.tar.xz"
             if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then
                 echo "shellcheck already downloaded - skipping..."
                 exit 0
@@ -55,6 +59,8 @@ case $1 in
             exit 0
         fi
         git clone https://github.com/bats-core/bats-core.git "${ROOT_DIR}/../target/bats"
+        git clone https://github.com/ztombol/bats-support.git "${ROOT_DIR}/target/test_helper/bats-support"
+        git clone https://github.com/ztombol/bats-assert "${ROOT_DIR}/target/test_helper/bats-assert"
         ;;
     run-bats)
             echo "Running bats"

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.2.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

docs/src/test/bats/fixtures/gs-contract-rest/complete/contract-rest-service/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
 	<dependencies>

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.2.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 

docs/src/test/bats/fixtures/gs-contract-rest/initial/contract-rest-service/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.3.0.BUILD-SNAPSHOT</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<spring-cloud.version>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-contract.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-contract.version>
 	</properties>
 
 	<dependencies>

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
@@ -23,6 +23,9 @@
 	<profiles>
 		<profile>
 			<id>docs</id>
+			<properties>
+				<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+			</properties>
 			<build>
 				<plugins>
 					<plugin>

docs/src/test/bats/fixtures/spring-cloud-stream/pom.xml

@@ -4,12 +4,12 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-stream-parent</artifactId>
-	<version>2.2.0.BUILD-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<scm>
@@ -28,7 +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>3.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>3.0.1.RELEASE</spring-cloud-function.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 
 	<dependencies>

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 
 	<dependencies>

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 
 	<dependencies>

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.

docs/src/test/bats/fixtures/spring-cloud-stream/spring-cloud-stream-tools/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>2.2.0.BUILD-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.0.BUILD-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 

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>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR1</version>
 	</parent>
 
 	<dependencies>

docs/src/test/bats/ghpages.bats

@@ -1,8 +1,8 @@
 #!/usr/bin/env bats
 
 load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
+load '../../../target/test_helper/bats-support/load'
+load '../../../target/test_helper/bats-assert/load'
 
 setup() {
 	export TEMP_DIR="$( mktemp -d )"
@@ -84,6 +84,7 @@ export -f printing_git_with_remotes
 export -f stubbed_git
 
 @test "should upload the built docs to the root of gh-pages for snapshot versions" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -111,6 +112,7 @@ export -f stubbed_git
 }
 
 @test "should upload the built docs to spring-cloud-static gh-pages branch for non-snapshot versions" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -145,6 +147,7 @@ export -f stubbed_git
 }
 
 @test "should upload the release train docs to spring-cloud-static under the release train folder" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	export SOURCE_FUNCTIONS=""
 	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
@@ -217,6 +220,7 @@ export -f stubbed_git
 }
 
 @test "should retrieve the name of the current branch" {
+	export BRANCH=master
 	export GIT_BIN="stubbed_git"
 	cd "${TEMP_DIR}/spring-cloud-stream/"
 	source "${SOURCE_DIR}"/ghpages.sh

docs/src/test/bats/update-guides.bats

@@ -1,8 +1,8 @@
 #!/usr/bin/env bats
 
 load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
+load '../../../target/test_helper/bats-support/load'
+load '../../../target/test_helper/bats-assert/load'
 
 setup() {
 	export TEMP_DIR="$( mktemp -d )"

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.2.0.M5</version>
+	<version>3.0.0-M2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,12 +28,12 @@
 		<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.M6</spring-boot.version>
-		<spring-cloud-build.version>2.2.0.M5</spring-cloud-build.version>
+		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>3.0.0-M2</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
-		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
+		<spring-doc-resources.version>0.2.1.RELEASE</spring-doc-resources.version>
+		<spring-asciidoctor-extensions.version>0.2.0.RELEASE
 		</spring-asciidoctor-extensions.version>
 		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>1.5.18</asciidoctorj-diagram.version>
@@ -55,7 +55,7 @@
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
 		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
-		<puppycrawl-tools-checkstyle.version>8.18</puppycrawl-tools-checkstyle.version>
+		<puppycrawl-tools-checkstyle.version>8.29</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
 		<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
@@ -71,12 +71,14 @@
 		<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
-		<asciidoctor-maven-plugin.version>1.5.7.1</asciidoctor-maven-plugin.version>
+		<asciidoctor-maven-plugin.version>1.5.8</asciidoctor-maven-plugin.version>
 		<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
 		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
-		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+		<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+		<pitest-maven.version>1.5.0</pitest-maven.version>
+		<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true
@@ -100,6 +102,17 @@
 		<ant-nodeps.version>1.8.1</ant-nodeps.version>
 		<configprops.path>${project.basedir}/src/main/asciidoc/_configprops.adoc</configprops.path>
 		<configprops.inclusionPattern>.*</configprops.inclusionPattern>
+		<maven-dependency-plugin-for-docs.phase>generate-resources</maven-dependency-plugin-for-docs.phase>
+		<maven-dependency-plugin-for-guides.phase>generate-resources</maven-dependency-plugin-for-guides.phase>
+		<generated-docs-multipage-output.dir>${project.build.directory}/generated-docs/reference/html</generated-docs-multipage-output.dir>
+		<generated-docs-singlepage-output.dir>${project.build.directory}/generated-docs/reference/htmlsingle</generated-docs-singlepage-output.dir>
+		<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
+		<javadoc.failOnError>false</javadoc.failOnError>
+		<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
+		<maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
+		<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
+		<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
+		<upload-docs-zip.phase>none</upload-docs-zip.phase>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -233,9 +246,8 @@
 					</execution>
 				</executions>
 				<configuration>
-					<!-- TODO: We need to patch the javadocs instead of disabling this -->
-					<failOnError>false</failOnError>
-					<quiet>true</quiet>
+					<failOnError>${javadoc.failOnError}</failOnError>
+					<failOnWarnings>${javadoc.failOnWarnings}</failOnWarnings>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -251,42 +263,33 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!--<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<inherited>true</inherited>
-				<configuration>
-					<updatePomFile>true</updatePomFile>
-					<flattenMode>oss</flattenMode>
-					<pomElements>
-						<parent>expand</parent>
-						<distributionManagement>remove</distributionManagement>
-						<repositories>remove</repositories>
-					</pomElements>
-				</configuration>
-				<executions>
-					&lt;!&ndash; enable flattening &ndash;&gt;
-					<execution>
-						<id>flatten</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>flatten</goal>
-						</goals>
-					</execution>
-					&lt;!&ndash; ensure proper cleanup &ndash;&gt;
-					<execution>
-						<id>flatten.clean</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>-->
 		</plugins>
 		<pluginManagement>
 			<plugins>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>flatten-maven-plugin</artifactId>
+					<inherited>true</inherited>
+					<executions>
+						<execution>
+							<!-- Tidy up all POMs before they are published -->
+							<id>flatten</id>
+							<phase>process-resources</phase>
+							<goals>
+								<goal>flatten</goal>
+							</goals>
+							<configuration>
+								<updatePomFile>true</updatePomFile>
+								<flattenMode>oss</flattenMode>
+								<pomElements>
+									<parent>expand</parent>
+									<distributionManagement>remove</distributionManagement>
+									<repositories>remove</repositories>
+								</pomElements>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 				<!-- Apply more sensible defaults for user projects -->
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -441,7 +444,6 @@
 									checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
 								</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
-								<!-- TODO: Start fixing the errors -->
 								<includeTestSourceDirectory>
 									${maven-checkstyle-plugin.includeTestSourceDirectory}
 								</includeTestSourceDirectory>
@@ -756,6 +758,9 @@
 					<url>https://repo.spring.io/libs-milestone-local</url>
 				</repository>
 			</distributionManagement>
+			<properties>
+				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-milestone-local</maven-deploy-plugin.deployZipUrl>
+			</properties>
 		</profile>
 		<profile>
 			<id>bintray</id>
@@ -789,6 +794,9 @@
 					</plugin>
 				</plugins>
 			</build>
+			<properties>
+				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-release-local</maven-deploy-plugin.deployZipUrl>
+			</properties>
 		</profile>
 		<profile>
 			<id>guides</id>
@@ -801,7 +809,7 @@
 						<executions>
 							<execution>
 								<id>unpack-docs</id>
-								<phase>generate-resources</phase>
+								<phase>${maven-dependency-plugin-for-guides.phase}</phase>
 								<goals>
 									<goal>unpack</goal>
 								</goals>
@@ -865,6 +873,23 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>java11</id>
+			<activation>
+				<jdk>[1.11,)</jdk>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<configuration>
+							<!-- https://bugs.java.com/bugdatabase/view_bug.do?bug_id=8212233 -->
+							<source>8</source>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<!-- TODO: remove this (it's covered with checkstyle, but not all projects use that yet -->
 			<id>imports</id>
@@ -927,7 +952,7 @@
 							<executions>
 								<execution>
 									<id>unpack-docs</id>
-									<phase>generate-resources</phase>
+									<phase>${maven-dependency-plugin-for-docs.phase}</phase>
 									<goals>
 										<goal>unpack</goal>
 									</goals>
@@ -1068,35 +1093,36 @@
 									<toc>left</toc>
 									<toc-levels>4</toc-levels>
 									<sectlinks>true</sectlinks>
-									<sources-root>${project.basedir}/src</sources-root>
-									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-									<generated-resources-root>${project.basedir}/target/generated-resources
+									<sources-root>${project.basedir}/src@</sources-root>
+									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc@</asciidoc-sources-root>
+									<generated-resources-root>${project.basedir}/target/generated-resources@
 									</generated-resources-root>
 									<!-- Use this attribute the reference code from another module -->
-									<project-root>${maven.multiModuleProjectDirectory}</project-root>
+									<!-- Note the @ at the end, lowering the precedence of the attribute -->
+									<project-root>${maven.multiModuleProjectDirectory}@</project-root>
 									<!-- It's mandatory for you to pass the docs.main property -->
-									<github-repo>${docs.main}</github-repo>
+									<github-repo>${docs.main}@</github-repo>
 									<github-raw>
-										https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
+										https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}@
 									</github-raw>
-									<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
+									<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}@
 									</github-code>
-									<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-									<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-									<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
+									<github-issues>https://github.com/spring-cloud/${docs.main}/issues/@</github-issues>
+									<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki@</github-wiki>
+									<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master@
 									</github-master-code>
-									<index-link>${index-link}</index-link>
+									<index-link>${index-link}@</index-link>
 
 									<!-- Spring Cloud specific -->
 									<!-- for backward compatibility -->
-									<spring-cloud-version>${project.version}</spring-cloud-version>
-									<project-version>${project.version}</project-version>
-									<github-tag>${github-tag}</github-tag>
-									<version-type>${version-type}</version-type>
-									<docs-url>${docs-url}</docs-url>
-									<raw-docs-url>${raw-docs-url}</raw-docs-url>
-									<project-version>${project.version}</project-version>
-									<project-name>${docs.main}</project-name>
+									<spring-cloud-version>${project.version}@</spring-cloud-version>
+									<project-version>${project.version}@</project-version>
+									<github-tag>${github-tag}@</github-tag>
+									<version-type>${version-type}@</version-type>
+									<docs-url>https://docs.spring.io/${docs.main}/docs/${project.version}@</docs-url>
+									<raw-docs-url>${github-raw}@</raw-docs-url>
+									<project-version>${project.version}@</project-version>
+									<project-name>${docs.main}@</project-name>
 								</attributes>
 								<!-- end::attributes[] -->
 								<requires>
@@ -1116,18 +1142,19 @@
 											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
 											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/html
+										<outputDirectory>${generated-docs-multipage-output.dir}
 										</outputDirectory>
 										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
+											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
 											<stylesheet>spring.css</stylesheet>
+											<linkcss>true</linkcss>
+											<icons>font</icons>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>github</highlightjs-theme>
+											<imagesdir>./images</imagesdir>
 											<attribute-missing>warn</attribute-missing>
 										</attributes>
 										<logHandler>
@@ -1150,18 +1177,19 @@
 											<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
 										<outputDirectory>
-											${project.build.directory}/generated-docs/reference/htmlsingle
+											${generated-docs-singlepage-output.dir}
 										</outputDirectory>
 										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
+											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
 											<stylesheet>spring.css</stylesheet>
+											<linkcss>true</linkcss>
+											<icons>font</icons>
+											<highlightjsdir>js/highlight</highlightjsdir>
+											<highlightjs-theme>github</highlightjs-theme>
+											<imagesdir>./images</imagesdir>
 										</attributes>
 									</configuration>
 								</execution>
@@ -1176,7 +1204,7 @@
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
+										<outputDirectory>${generated-docs-pdf-output.dir}
 										</outputDirectory>
 										<resources>
 											<resource>
@@ -1315,68 +1343,11 @@
 														   input="${git.branch}" regexp="origin/(.*)"
 														   replace="\1"/>
 											<var name="github-tag" value="${git.branch}"/>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<or>
-														<equals arg1="${git.branch}" arg2="master"/>
-														<equals arg1="${git.branch}" arg2="origin/master"/>
-													</or>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}/${git.branch}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<not>
-														<or>
-															<equals arg1="${git.branch}" arg2="master"/>
-															<equals arg1="${git.branch}" arg2="origin/master"/>
-														</or>
-													</not>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/spring-cloud-static/${docs.main}/${project.version}">
-												<and>
-													<not>
-														<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													</not>
-												</and>
-											</condition>
-											<propertyregex property="raw-docs-url" override="true"
-														   input="${docs-url}" regexp="https://cloud.spring.io/(.*)"
-														   replace="https://raw.githubusercontent.com/\1"/>
 										</target>
 									</configuration>
 								</execution>
 							</executions>
 						</plugin>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>${build-helper-maven-plugin.version}</version>
-							<inherited>false</inherited>
-							<executions>
-								<execution>
-									<id>attach-zip</id>
-									<goals>
-										<goal>attach-artifact</goal>
-									</goals>
-									<configuration>
-										<artifacts>
-											<artifact>
-												<file>
-													${project.build.directory}/${project.artifactId}-${project.version}.zip
-												</file>
-												<type>zip</type>
-											</artifact>
-										</artifacts>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>
@@ -1403,6 +1374,29 @@
 								</execution>
 							</executions>
 						</plugin>
+						<plugin>
+							<artifactId>maven-deploy-plugin</artifactId>
+							<version>${maven-deploy-plugin.version}</version>
+							<executions>
+								<execution>
+									<id>upload-docs-zip</id>
+									<phase>${upload-docs-zip.phase}</phase>
+									<goals>
+										<goal>deploy-file</goal>
+									</goals>
+									<configuration>
+										<generatePom>false</generatePom>
+										<groupId>${project.groupId}</groupId>
+										<artifactId>${project.artifactId}</artifactId>
+										<version>${project.version}</version>
+										<repositoryId>${maven-deploy-plugin.deployZipRepositoryId}</repositoryId>
+										<url>${maven-deploy-plugin.deployZipUrl}</url>
+										<file>${project.build.directory}/${project.artifactId}-${project.version}.zip</file>
+										<packaging>zip;zip.type=docs;zip.deployed=false;</packaging>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
 					</plugins>
 				</pluginManagement>
 			</build>
@@ -1484,5 +1478,42 @@
 				<checkstyle.skip>true</checkstyle.skip>
 			</properties>
 		</profile>
+		<profile>
+			<id>mutation</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.pitest</groupId>
+						<artifactId>pitest-maven</artifactId>
+						<version>${pitest-maven.version}</version>
+						<configuration>
+							<!-- generate line coverage -->
+							<exportLineCoverage>true</exportLineCoverage>
+							<!-- in the "right" format -->
+							<outputFormats><value>XML</value></outputFormats>
+							<!-- and write reports where report-aggregate-module expects to find it -->
+							<timestampedReports>false</timestampedReports>
+							<!-- There are modules that don't have tests -->
+							<failWhenNoMutations>false</failWhenNoMutations>
+						</configuration>
+						<executions>
+							<execution>
+								<id>mutationCoverage</id>
+								<goals>
+									<goal>mutationCoverage</goal>
+								</goals>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.pitest</groupId>
+								<artifactId>pitest-junit5-plugin</artifactId>
+								<version>${pitest-junit5-plugin.version}</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>

scripts/build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./mvnw clean install -B -Pdocs ${@}
+#./mvnw clean install -B -DskipTests ${@}

spring-cloud-build-dependencies/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.2.0.M5</version>
+	<version>3.0.0-M2</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,13 +14,49 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.0.M6</version>
+		<version>2.3.0.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.0.M6</spring-boot.version>
+		<spring-boot.version>2.3.0.RELEASE</spring-boot.version>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<execution>
+						<!-- Flatten and simplify our own POM for install/deploy -->
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+						<configuration>
+							<updatePomFile>true</updatePomFile>
+							<flattenMode>bom</flattenMode>
+							<pomElements>
+								<parent>expand</parent>
+								<pluginManagement>keep</pluginManagement>
+								<properties>keep</properties>
+								<repositories>remove</repositories>
+							</pomElements>
+						</configuration>
+					</execution>
+					<execution>
+						<id>flatten-clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
@@ -83,6 +119,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

spring-cloud-build-tools/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M5</version>
+		<version>3.0.0-M2</version>
 	</parent>
 	<dependencies>
 		<dependency>

spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml

@@ -9,6 +9,7 @@
 	<suppress files=".*example.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*integration-tests.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files="(.*Tests\.java|.*Tests\.groovy)" checks="Javadoc*"/>
+	<suppress files=".*src.test.java.*" checks="Javadoc*"/>
 	<suppress files="generated-sources" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*target.*" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*build.*" checks="[a-zA-Z0-9]*"/>

spring-cloud-build-tools/src/checkstyle/nohttp-checkstyle.xml

@@ -24,6 +24,6 @@
 	<!-- Configure checker to run on files with these extensions -->
 	<property name="fileExtensions" value=""/>
 	<!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
-	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
-	</module>
+	<!--<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+	</module>-->
 </module>

spring-cloud-build-tools/src/main/resources/checkstyle.xml

@@ -122,11 +122,6 @@
 			<property name="excludeScope" value="package"/>
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-			<property name="scope" value="public"/>
-			<property name="excludeScope" value="package"/>
-			<property name="allowMissingJavadoc" value="true"/>
-		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>
 		</module>

spring-cloud-dependencies-parent/pom.xml

@@ -4,7 +4,7 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.2.0.M5</version>
+	<version>3.0.0-M2</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -130,9 +130,43 @@
 			</distributionManagement>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<inherited>true</inherited>
+						<executions>
+							<execution>
+								<!-- Flatten and simplify our own POM for install/deploy -->
+								<id>flatten</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>flatten</goal>
+								</goals>
+								<configuration>
+									<updatePomFile>true</updatePomFile>
+									<flattenMode>bom</flattenMode>
+									<pomElements>
+										<parent>expand</parent>
+										<pluginManagement>keep</pluginManagement>
+										<properties>keep</properties>
+										<repositories>remove</repositories>
+										<profiles>keep</profiles>
+									</pomElements>
+								</configuration>
+							</execution>
+							<execution>
+								<id>flatten-clean</id>
+								<phase>clean</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -195,41 +229,6 @@
 		</profile>
 	</profiles>
 	<build>
-		<plugins>
-			<!--<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<inherited>true</inherited>
-				<configuration>
-					<updatePomFile>true</updatePomFile>
-					<flattenMode>oss</flattenMode>
-					<pomElements>
-						<parent>expand</parent>
-						<distributionManagement>remove</distributionManagement>
-						<repositories>remove</repositories>
-					</pomElements>
-				</configuration>
-				<executions>
-					&lt;!&ndash; enable flattening &ndash;&gt;
-					<execution>
-						<id>flatten</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>flatten</goal>
-						</goals>
-					</execution>
-					&lt;!&ndash; ensure proper cleanup &ndash;&gt;
-					<execution>
-						<id>flatten.clean</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>-->
-		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>