Update SNAPSHOT to 2.3.5.RELEASE

Switch back to 2.3.6.BUILD-SNAPSHOT.
This reverts commit 47b9d802fb.
2026-09-17 21:09:00 +00:00 · 2021-07-06 14:17:05 +00:00 · 2021-07-05 14:18:08 +02:00 · 2021-07-05 11:48:59 +00:00 · 2021-07-05 13:45:07 +02:00 · 2021-07-05 13:44:48 +02:00
41 changed files with 837 additions and 506 deletions
@@ -1,39 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: springcloud/pipeline-base
-        user: appuser
-    environment:
-      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-      TERM: dumb
-    branches:
-      ignore:
-        - gh-pages # list of branches to ignore
-    steps:
-      - checkout
-      - restore_cache:
-          key: sc-build-{{ .Branch }}
-      - run:
-          name: "Download dependencies"
-          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
-      - save_cache:
-          key: sc-build-{{ .Branch }}
-          paths:
-            - ~/.m2
-      - run:
-          name: "Running build"
-          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-      - run:
-          name: "Aggregate test results"
-          when: always
-          command: |
-            mkdir -p ~/junit/
-            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
-            bash <(curl -s https://codecov.io/bash)
-      - store_artifacts:
-          path: ~/junit/
-          destination: artifacts
-      - store_test_results:
-          path: ~/junit/
-          destination: testartifacts
@@ -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.
@@ -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.
@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ 2.3.x ]
+  pull_request:
+    branches: [ 2.3.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ["8", "11", "16"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U
@@ -19,3 +19,4 @@ _site/
 .vscode/
 .flattened-pom.xml
 .DS_Store
+.sdkmanrc
@@ -4,7 +4,8 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////

-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -226,6 +227,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
@@ -236,38 +255,38 @@ approach of generating documentation just add these plugins to your `docs` modul
 [source,xml]
 ----
 <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>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 ----
 <2> 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
@@ -287,42 +306,43 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 [source,xml]
 ----
 <attributes>
-	<docinfo>shared</docinfo>
-	<allow-uri-read>true</allow-uri-read>
-	<nofooter/>
-	<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
-	</generated-resources-root>
-	<!-- Use this attribute the reference code from another module -->
-	<!-- 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-raw>
-		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>
-	<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>
+    <docinfo>shared</docinfo>
+    <allow-uri-read>true</allow-uri-read>
+    <nofooter/>
+    <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@
+    </generated-resources-root>
+    <!-- Use this attribute the reference code from another module -->
+    <!-- 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-project>https://github.com/spring-cloud/${docs.main}@</github-project>
+    <github-raw>
+        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>
+    <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>

-	<!-- 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 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>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>
 ----

@@ -355,4 +375,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`).
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -10,17 +10,18 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.5.RELEASE</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>
 		<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>
+		<maven-dependency-plugin-for-docs-classes.phase>none</maven-dependency-plugin-for-docs-classes.phase>
 		<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+		<!-- We don't want to reference plugin classpath of ourselves -->
+		<readme.class.path>maven.compile.classpath</readme.class.path>
 	</properties>
 	<dependencies>
 		<!-- Script -->
@@ -36,23 +37,15 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<!-- Asciidoctor -->
 		<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>org.asciidoctor</groupId>
+			<artifactId>asciidoctorj</artifactId>
+			<version>${asciidoctorj.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -66,39 +59,26 @@
 			<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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.3.0</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
 				<executions>
 					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
+						<id>make-assembly</id>
+						<phase>package</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>
+							<goal>single</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -138,36 +118,12 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
 					</plugin>
-				</plugins>
-			</build>
-		</profile>
-		<profile>
-			<id>unix</id>
-			<activation>
-				<os>
-					<family>unix</family>
-					<name>Linux</name>
-				</os>
-			</activation>
-			<build>
-				<plugins>
 					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
-						<groupId>org.codehaus.mojo</groupId>
-						<executions>
-							<execution>
-								<id>Run tests</id>
-								<phase>test</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<skip>${skipTests}</skip>
-									<!-- <skip>true</skip> -->
-									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
-								</configuration>
-							</execution>
-						</executions>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<goals>
+							<goal>deploy</goal>
+							<goal>deploy-file</goal>
+						</goals>
 					</plugin>
 				</plugins>
 			</build>
@@ -1,4 +1,4 @@
-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]

 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -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
@@ -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
@@ -1 +1 @@
-NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {docslink}[github].
+NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {github-project}[github].
@@ -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}"
-		}
-	}
-}
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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;
+import org.springframework.util.StringUtils;
+
+/**
+ * @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;
+							}
+							Object description = 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 String defaultValue;
+
+		ConfigValue() {
+		}
+
+		ConfigValue(String name, Object 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 + " | " + (StringUtils.hasText(defaultValue) ? ("`" + defaultValue + "`") : "") + " | " + description;
+		}
+
+	}
+
+}
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.internal.asciidoctor;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.extension.Preprocessor;
+import org.asciidoctor.extension.PreprocessorReader;
+
+// taken from https://github.com/hibernate/hibernate-asciidoctor-extensions/blob/1.0.3.Final/src/main/java/org/hibernate/infra/asciidoctor/extensions/savepreprocessed/SavePreprocessedOutputPreprocessor.java
+/**
+ * Preprocessor used to save the preprocessed output of the asciidoctor conversion. It allows to generate a single file
+ * integrating all the includes.
+ *
+ * @author Guillaume Smet
+ */
+class CoalescerPreprocessor extends Preprocessor {
+
+	private final File outputFile;
+
+	private static final List<String> FILTER_LICENSE_MARKERS = Arrays.asList("[preface]", "<<<");
+
+	private static final String COMMENT_MARKER = "//";
+
+	private static final String SOURCE_MARKER = "[source";
+
+	private static final List<String> SECTION_MARKERS = Arrays.asList("----", "....");
+
+	private static final String HEADER = "////\n" + "DO NOT EDIT THIS FILE. IT WAS GENERATED.\n"
+			+ "Manual changes to this file will be lost when it is generated again.\n"
+			+ "Edit the files in the src/main/asciidoc/ directory instead.\n" + "////\n\n";
+
+	CoalescerPreprocessor(File output_file) {
+		outputFile = output_file;
+	}
+
+	@Override
+	public void process(Document document, PreprocessorReader preprocessorReader) {
+		try {
+			LinkedList<String> filteredLines = filterLines(preprocessorReader.readLines());
+			filteredLines.addFirst(HEADER);
+			Files.write(outputFile.toPath(), filteredLines);
+		}
+		catch (IOException e) {
+			throw new IllegalStateException("Unable to write the preprocessed file " + outputFile, e);
+		}
+	}
+
+	/**
+	 * This is used to filter out the license headers that are just after the markers
+	 * defined. It also reindents the source code with spaces to be consistent with the
+	 * 1.1 spec.
+	 */
+	private LinkedList<String> filterLines(List<String> lines) {
+		LinkedList<String> filteredLines = new LinkedList<>();
+		ParsingState state = ParsingState.NORMAL;
+		int counter = 0;
+		for (String line : lines) {
+			counter++;
+			switch (state) {
+			case NORMAL:
+				if (FILTER_LICENSE_MARKERS.contains(line)) {
+					state = ParsingState.FILTER_LICENSE;
+				}
+				else if (line.startsWith(SOURCE_MARKER)) {
+					state = ParsingState.SOURCE;
+				}
+				break;
+			case SOURCE:
+				if (SECTION_MARKERS.contains(line)) {
+					state = ParsingState.SOURCE_CONTENT;
+				}
+				else {
+					System.err.println("[source] requires to be followed by a section marker and line number [" + counter + "] with content [" + line + "] doesn't have it");
+				}
+				break;
+			case SOURCE_CONTENT:
+				if (SECTION_MARKERS.contains(line)) {
+					state = ParsingState.NORMAL;
+				}
+				else {
+					filteredLines.add(line.replaceAll("\t", "    "));
+					continue;
+				}
+				break;
+			case FILTER_LICENSE:
+				if (line.startsWith(COMMENT_MARKER)) {
+					continue;
+				}
+				else {
+					state = ParsingState.NORMAL;
+				}
+				break;
+			}
+			filteredLines.add(line);
+		}
+		return filteredLines;
+	}
+
+	private enum ParsingState {
+
+		NORMAL, FILTER_LICENSE, SOURCE, SOURCE_CONTENT,
+
+	}
+
+}
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2012-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.internal.asciidoctor;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
+import org.asciidoctor.SafeMode;
+
+public class ReadmeMain {
+	public static void main(String... args) {
+		File inputFile = new File(args[0]);
+		File outputFile = new File(args[1]);
+		System.out.println("Will do the Readme conversion from [" + inputFile + "] to [" + outputFile + "]");
+		if (!inputFile.exists()) {
+			System.out.println("There's no file [" + inputFile + "], skipping readme generation");
+			return;
+		}
+		new ReadmeMain().convert(inputFile, outputFile);
+	}
+
+	void convert(File input, File output) {
+		Asciidoctor asciidoctor = Asciidoctor.Factory.create();
+		asciidoctor.javaExtensionRegistry().preprocessor(new CoalescerPreprocessor(output));
+		Options options = options(input, output);
+		try {
+			String fileAsString = new String(Files.readAllBytes(input.toPath()));
+			asciidoctor.convert(fileAsString, options);
+			System.out.println("Successfully converted the Readme file!\n");
+		} catch (IOException ex) {
+			throw new IllegalStateException("Failed to convert the file", ex);
+		}
+	}
+
+	private Options options(File input, File output) {
+		Attributes attributes = new Attributes();
+		attributes.setAllowUriRead(true);
+		attributes.setAttribute("project-root", output.getParent());
+		Options options = new Options();
+		options.setSourceDir(input.getParent());
+		options.setBaseDir(input.getParent());
+		options.setAttributes(attributes);
+		options.setSafe(SafeMode.UNSAFE);
+		options.setParseHeaderOnly(true);
+		return options;
+	}
+}
@@ -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"
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.12.RELEASE</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>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.7.SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,15 +11,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.12.RELEASE</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>Hoxton.BUILD-SNAPSHOT</spring-cloud.version>
-		<spring-cloud-contract.version>2.2.0.BUILD-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud.version>Hoxton.SNAPSHOT</spring-cloud.version>
+		<spring-cloud-contract.version>2.2.7.SNAPSHOT</spring-cloud-contract.version>
 	</properties>

 	<dependencies>
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>spring-cloud-stream-core-docs</name>
@@ -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>2.3.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.BUILD-SNAPSHOT</version>
+		<version>2.3.4.BUILD-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.14.SNAPSHOT</spring-cloud-function.version>

 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true</maven-checkstyle-plugin.failsOnViolation>
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>

 	<dependencies>
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>

 	<dependencies>
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-stream-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support-internal</artifactId>
 	<description>Set of classes and utility code that may assist in testing both
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>
 	<artifactId>spring-cloud-stream-test-support</artifactId>
 	<description>A set of classes to ease testing of Spring Cloud Stream modules.
@@ -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>2.3.4.BUILD-SNAPSHOT</version>
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.0.BUILD-SNAPSHOT</version>
+        <version>2.3.4.BUILD-SNAPSHOT</version>
        <relativePath />
    </parent>

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-stream-parent</artifactId>
-		<version>Horsham.BUILD-SNAPSHOT</version>
+		<version>Horsham.SR11</version>
 	</parent>

 	<dependencies>
@@ -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
@@ -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 )"
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.2.0.RC1</version>
+	<version>2.3.5.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,19 +28,20 @@
 		<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.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.2.0.RC1</spring-cloud-build.version>
+		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.3.5.RELEASE</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
+		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.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.2.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>
+		<asciidoctorj-diagram.version>2.0.2</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
-		<asciidoctorj.version>1.5.8</asciidoctorj.version>
+		<asciidoctorj.version>2.1.0</asciidoctorj.version>
 		<jruby-complete.version>9.2.7.0</jruby-complete.version>

 		<!-- Sonar -->
@@ -71,7 +72,7 @@
 		<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.8</asciidoctor-maven-plugin.version>
+		<asciidoctor-maven-plugin.version>1.6.0</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>
@@ -101,7 +102,17 @@
 		<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-docs-classes.phase>generate-resources</maven-dependency-plugin-for-docs-classes.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>
+		<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>
+		<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
+		<readme.class.path>readme.class.path</readme.class.path>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -253,42 +264,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>
@@ -443,7 +445,6 @@
 									checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
 								</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
-								<!-- TODO: Start fixing the errors -->
 								<includeTestSourceDirectory>
 									${maven-checkstyle-plugin.includeTestSourceDirectory}
 								</includeTestSourceDirectory>
@@ -493,6 +494,7 @@
 							${project.build.outputDirectory}/git.properties
 						</generateGitPropertiesFilename>
 						<skipPoms>false</skipPoms>
+						<useNativeGit>true</useNativeGit>
 					</configuration>
 				</plugin>
 				<!-- Support our own plugin -->
@@ -713,11 +715,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-plugins</id>
-					<name>Spring Maven Plugins Repository</name>
-					<url>https://repo.spring.io/plugins-release</url>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -758,6 +755,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>
@@ -791,6 +791,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>
@@ -867,6 +870,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>
@@ -951,6 +971,30 @@
 										</artifactItems>
 									</configuration>
 								</execution>
+								<execution>
+									<id>unpack-classes</id>
+									<phase>${maven-dependency-plugin-for-docs-classes.phase}</phase>
+									<goals>
+										<goal>unpack</goal>
+									</goals>
+									<configuration>
+										<artifactItems>
+											<artifactItem>
+												<groupId>org.springframework.cloud
+												</groupId>
+												<artifactId>spring-cloud-build-docs
+												</artifactId>
+												<version>${spring-cloud-build.version}
+												</version>
+												<classifier>jar-with-dependencies</classifier>
+												<type>jar</type>
+												<overWrite>true</overWrite>
+												<outputDirectory>${docs.classes.dir}
+												</outputDirectory>
+											</artifactItem>
+										</artifactItems>
+									</configuration>
+								</execution>
 								<execution>
 									<id>unpack-docs-resources</id>
 									<phase>generate-resources</phase>
@@ -1070,36 +1114,37 @@
 									<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 -->
 									<!-- 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-project>https://github.com/spring-cloud/${docs.main}@</github-project>
 									<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>
@@ -1119,18 +1164,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>
@@ -1153,18 +1199,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>
@@ -1179,7 +1226,7 @@
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
+										<outputDirectory>${generated-docs-pdf-output.dir}
 										</outputDirectory>
 										<resources>
 											<resource>
@@ -1233,16 +1280,20 @@
 							<executions>
 								<execution>
 									<id>readme</id>
-									<phase>process-resources</phase>
+									<phase>prepare-package</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
 									<configuration>
 										<target>
-											<java classname="org.jruby.Main"
-												  failonerror="yes">
-												<arg value="${docs.resources.dir}/ruby/generate_readme.sh"/>
-												<arg value="-o"/>
+											<path id="readme.class.path">
+												<pathelement location="${readme.main.classpath}"/>
+											</path>
+											<java classname="org.springframework.cloud.internal.asciidoctor.ReadmeMain"
+												  failonerror="yes" classpathref="${readme.class.path}">
+												<!-- Input -->
+												<arg value="${project.basedir}/src/main/asciidoc/README.adoc"/>
+												<!-- Output -->
 												<arg value="${main.basedir}/README.adoc"/>
 											</java>
 										</target>
@@ -1318,68 +1369,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>
@@ -1406,6 +1400,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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.2.0.RC1</version>
+	<version>2.3.5.RELEASE</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.RELEASE</version>
+		<version>2.3.12.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
+		<spring-boot.version>2.3.12.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>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.3.5.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -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]*"/>
@@ -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>
@@ -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.RC1</version>
+	<version>2.3.5.RELEASE</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>
Author	SHA1	Message	Date
buildmaster	ca3f430556	Update SNAPSHOT to 2.3.5.RELEASE	2021-07-06 14:17:05 +00:00
Olga MaciaszekSharma	15c06dc1b3	Switch back to 2.3.6.BUILD-SNAPSHOT. This reverts commit `47b9d802fb`.	2021-07-05 14:18:08 +02:00
buildmaster	ea356558fa	Bumping versions	2021-07-05 11:48:59 +00:00
Olga MaciaszekSharma	a00d131824	Revert "Bumping versions" This reverts commit `d0617e7769`.	2021-07-05 13:45:07 +02:00
Olga MaciaszekSharma	47b9d802fb	Revert "Switch version to `2.3.6.BUILD-SNAPSHOT`." This reverts commit `ba151bc2f4`.	2021-07-05 13:44:48 +02:00
Olga MaciaszekSharma	ba151bc2f4	Switch version to `2.3.6.BUILD-SNAPSHOT`.	2021-07-01 13:02:14 +02:00
buildmaster	d0617e7769	Bumping versions	2021-07-01 10:51:01 +00:00
Olga MaciaszekSharma	54ca8896f4	Bump boot to 2.3.12.RELEASE.	2021-07-01 12:28:40 +02:00
Olga MaciaszekSharma	7cc037d7cc	Switch to GH actions.	2021-05-13 12:46:18 +02:00
spencergibb	cef2a68ae1	Updates build to version 2.3.5.BUILD-SNAPSHOT	2021-04-20 15:27:18 -04:00
buildmaster	b9e5eb8bd2	Bumping versions	2021-04-20 19:03:50 +00:00
spencergibb	53a08a58ee	Updates build to version 2.3.4.BUILD-SNAPSHOT	2021-04-20 12:58:16 -04:00
Marcin Grzejszczak	384013e395	Bumping Boot to 2.3.9	2021-02-24 12:10:29 +01:00
Marcin Grzejszczak	2c70866ae7	Fixed wrong version	2021-02-15 11:55:42 +01:00
buildmaster	93716b3d31	Bumping versions to 2.3.3.SNAPSHOT after release	2021-02-08 20:51:44 +00:00
buildmaster	8c93d9c597	Going back to snapshots	2021-02-08 20:51:44 +00:00
buildmaster	1b50fb3d96	Update SNAPSHOT to 2.3.2.RELEASE	2021-02-08 20:47:35 +00:00
Marcin Grzejszczak	4bac0474d9	Removed plugins repo	2020-12-18 10:31:04 +01:00
Marcin Grzejszczak	1506765f75	Changed the plugins-release repo to plugins	2020-12-09 17:39:56 +01:00
Marcin Grzejszczak	6d5d80ae45	Fixed the invalid default value code formatting	2020-11-26 08:29:56 +01:00
Marcin Grzejszczak	80b1c9a661	Code for the default value	2020-11-16 14:14:49 +01:00
Olga Maciaszek-Sharma	09bc053a02	Fix artifact version.	2020-08-03 12:09:35 +02:00
buildmaster	2631bd9e4f	Bumping versions to 2.3.2.SNAPSHOT after release	2020-07-30 16:56:05 +00:00
buildmaster	c2ef62de73	Going back to snapshots	2020-07-30 16:56:04 +00:00
buildmaster	a247cbcfae	Update SNAPSHOT to 2.3.1.RELEASE	2020-07-30 16:47:53 +00:00
Ryan Baxter	c08320254e	Revert "Use https://repo.spring.io/snapshot " This reverts commit `fc23298240`.	2020-07-30 10:29:22 -04:00
Ryan Baxter	e296686584	Revert "Changing to https://repo.spring.io/snapshot " This reverts commit `d4a54620b8`.	2020-07-30 10:28:32 -04:00
spencergibb	53fd3a14c8	Bumps boot to version to 2.3.2.RELEASE	2020-07-30 10:06:50 -04:00
Ryan Baxter	d4a54620b8	Changing to https://repo.spring.io/snapshot	2020-07-29 17:11:38 -04:00
Ryan Baxter	1836d36388	Merge remote-tracking branch 'origin/2.2.x' into 2.3.x	2020-07-29 16:17:10 -04:00
Ryan Baxter	fc23298240	Use https://repo.spring.io/snapshot	2020-07-29 16:01:52 -04:00
Spencer Gibb	bd215fab95	Creates and uses new github-project url in docs (#169 ) Fixes gh-168	2020-07-07 12:41:16 -04:00
Marcin Grzejszczak	2491889a42	Skipping readme generation if there's no readme	2020-06-10 09:59:04 +02:00
Marcin Grzejszczak	b6a814b6cf	No more null description	2020-06-04 13:12:57 +02:00
Marcin Grzejszczak	d4fefdcd77	Migrating to the docs.spring.io	2020-06-04 13:11:04 +02:00
buildmaster	9fc5902087	Bumping versions to 2.3.1.BUILD-SNAPSHOT after release	2020-05-28 09:04:35 +00:00
buildmaster	44f2689dc3	Going back to snapshots	2020-05-28 09:04:34 +00:00
buildmaster	e96132ecf2	Update SNAPSHOT to 2.3.0.RELEASE	2020-05-28 08:59:41 +00:00
buildmaster	881c967d3c	Bumping versions	2020-05-28 08:46:59 +00:00
spencergibb	fb2e92be6b	Adds section about activating spring maven profile in IDE. Fixes gh-159	2020-05-21 16:13:27 -04:00
spencergibb	9bdff877fd	Ignores .sdkmanrc	2020-05-15 12:07:26 -04:00
spencergibb	0911190f3f	Bumps boot to version to 2.3.0.RELEASE	2020-05-15 12:06:31 -04:00
spencergibb	d11a135437	Bumps boot to version to 2.2.7.RELEASE	2020-05-13 15:17:42 -04:00
Olga Maciaszek-Sharma	d30799cf5c	Upgrade groovy.version to 2.5.10.	2020-05-13 17:28:05 +02:00
spencergibb	e84caac578	Merge remote-tracking branch 'origin/2.3.x' into 2.3.x	2020-05-08 13:54:14 -04:00
spencergibb	76f15c1cd9	Merge branch '2.2.x' into 2.3.x	2020-05-08 13:49:52 -04:00
spencergibb	27553b9dd9	set current branch for test	2020-05-08 13:45:06 -04:00
spencergibb	fe89ee7de0	set current branch for test	2020-05-08 13:40:16 -04:00
spencergibb	2821e3222c	set current branch for test	2020-05-08 13:36:21 -04:00
spencergibb	bb2126974f	set current branch for test	2020-05-08 13:34:34 -04:00
spencergibb	c7ebf03a2a	removes checked in bats libs	2020-05-08 13:10:50 -04:00
spencergibb	d673bca4da	Updates bats tests to cloe bats-support and bats-assert This along with upgrading to 0.7.0 of bats seems to fix bats tests. Fixes gh-150	2020-05-08 12:23:56 -04:00
maaaace	76873a53ab	fix(bashScript): download shellcheck to support arm64 processor build_helper.sh just downloads shellcheck for x86_64 architecture by hard coding the verison and arch of zip file. Fortunately shellcheck starts to support arm64 since version 0.7.0, as a result update the version and add checking for architecture to support arm64. Signed-off-by: maaaace <fuheming@huawei.com>	2020-05-08 12:23:49 -04:00
Olga Maciaszek-Sharma	bfa24ff981	Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit `eee1278025`.	2020-04-24 15:08:26 +02:00
Olga Maciaszek-Sharma	ea85edf36a	Revert "Bump checkstyle from 8.18 to 8.29" This reverts commit `46c9d176a0`.	2020-04-24 14:57:29 +02:00
Olga Maciaszek-Sharma	a6633729c6	Revert "Adjust to updates." This reverts commit `82cecb77d3`.	2020-04-24 14:57:10 +02:00
Olga Maciaszek-Sharma	680f28b193	Merge pull request #161 from spring-cloud/fix-checkstyle-setup-after-upgrade Adjust to updates.	2020-04-24 14:30:46 +02:00
Olga Maciaszek-Sharma	82cecb77d3	Adjust to updates.	2020-04-24 14:06:31 +02:00
dependabot[bot]	46c9d176a0	Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-23 18:08:58 +02:00
dependabot[bot]	eee1278025	Bump checkstyle from 8.18 to 8.29 Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.18 to 8.29. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.18...checkstyle-8.29) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-23 18:08:09 +02:00
Olga Maciaszek-Sharma	be6c1eae80	Suppress javadoc check for files in test directory.	2020-04-23 16:53:16 +02:00
Olga Maciaszek-Sharma	def18bdd4e	Suppress javadoc check for files in test directory.	2020-04-23 16:36:27 +02:00
Jay Bryant	288abb47b5	Upgrade spring-doc-resources Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1 to get a bug fix (setting the width of the HTML output).	2020-04-22 10:53:18 -04:00
Spencer Gibb	dae472a17d	Updates README.adoc	2020-04-22 10:51:16 -04:00
Jay Bryant	fb42a2cf89	Upgrade spring-doc-resources Upgrade spring-doc-resources from version 0.2.0 to version 0.2.1 to get a bug fix (setting the width of the HTML output).	2020-04-22 10:49:32 -04:00
Spencer Gibb	efcd0f89f1	Bumps boot to version to 2.3.0.M4	2020-04-03 10:22:09 -04:00
Spencer Gibb	a33e77df15	Revert "Bumps boot version to 2.3.0.M3" This reverts commit `2f67da30`	2020-03-19 10:33:25 -04:00
Spencer Gibb	2257f255d6	Bumps version to 2.3.0	2020-03-19 10:28:53 -04:00
Marcin Grzejszczak	e8482b1134	Fixing Groovy	2020-03-18 17:38:08 -04:00
Spencer Gibb	2f67da3078	Bumps boot version to 2.3.0.M3 fixes gh-153	2020-03-18 16:44:03 -04:00
Spencer Gibb	9295fc30ef	Updates docs branches	2020-03-06 12:43:48 -05:00
Spencer Gibb	880cf63c2c	Updates remaining versions to 2.2.4.BUILD-SNAPSHOT.	2020-03-04 15:11:09 -05:00
Spencer Gibb	417d78533a	Merge remote-tracking branch 'origin/2.2.x' into 2.2.x # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-build-tools/pom.xml	2020-03-04 15:06:31 -05:00
Marcin Grzejszczak	2e5868c5bd	Bumping build	2020-03-04 14:14:07 +01:00
Spencer Gibb	5e53b18ddf	Update SNAPSHOT to 2.2.3.RELEASE	2020-02-27 11:18:33 -05:00
Spencer Gibb	06bad4e6af	Bumps boot version to 2.2.5	2020-02-27 11:03:50 -05:00
Ryan Baxter	048656e13a	Bumping versions to 2.2.3.BUILD-SNAPSHOT	2020-02-12 10:52:51 -05:00
Ryan Baxter	7c82700143	2.2.2.RELEASE version changes	2020-02-12 10:45:38 -05:00
Spencer Gibb	c6e0bc7a26	bumps groovy version	2020-01-27 12:28:43 -05:00
Spencer Gibb	a8313feea7	Bumps boot version to 2.2.4	2020-01-27 11:51:02 -05:00
Spencer Gibb	2caeaee319	Skips bats tests. See gh-150	2020-01-23 17:10:02 -05:00
Marcin Grzejszczak	a579b7fb03	Externalized generated docs location	2020-01-04 18:28:27 +01:00
buildmaster	19044131d0	Bumping versions	2019-12-21 07:13:31 +00:00
Spencer Gibb	a29ba7bc95	temporarily comment out nohttp-checkstyle.xml	2019-12-19 15:08:48 -05:00
buildmaster	0953f45189	Bumping versions	2019-12-19 07:12:42 +00:00
buildmaster	e082a147a1	Bumping versions to 2.2.2.BUILD-SNAPSHOT after release	2019-12-18 13:42:52 +00:00
buildmaster	c35c8b5742	Going back to snapshots	2019-12-18 13:42:51 +00:00
buildmaster	e5d3206eab	Update SNAPSHOT to 2.2.1.RELEASE	2019-12-18 13:41:17 +00:00
buildmaster	ce0e50c1d9	Bumping versions	2019-12-18 13:19:01 +00:00
Spencer Gibb	e2d73c63ad	javadoc for java 13	2019-12-12 21:07:34 -05:00
buildmaster	03175d3e66	Bumping versions	2019-12-07 07:13:32 +00:00
Marcin Grzejszczak	ac156c7c80	Made more attributes overridable	2019-12-06 10:12:59 +01:00
Ryan Baxter	5e5d2b67ac	Configuring flatten plugin to keep central profile	2019-11-26 15:25:44 -05:00
Ryan Baxter	6c98d80678	Update issue templates	2019-11-19 16:28:21 -05:00
Ryan Baxter	9728af1d93	Creating security.md	2019-11-19 16:27:41 -05:00
buildmaster	2cd4391e49	Bumping versions to 2.2.1.BUILD-SNAPSHOT after release	2019-11-19 13:57:25 +00:00
buildmaster	bb26542fc9	Going back to snapshots	2019-11-19 13:57:24 +00:00
buildmaster	70f7d413f3	Update SNAPSHOT to 2.2.0.RELEASE	2019-11-19 13:56:18 +00:00
Marcin Grzejszczak	94efa8767a	Added missing javadocs fixes gh-148	2019-11-19 13:57:47 +01:00
buildmaster	06f8a97e59	Bumping versions	2019-11-19 07:12:35 +00:00
Ryan Baxter	51c41e52f6	Bumping version to next release	2019-11-18 16:02:37 -05:00
Ryan Baxter	b1a8036d3f	Revert "Change versions for release" This reverts commit `a5be66e84f`.	2019-11-18 15:59:13 -05:00
Ryan Baxter	a5be66e84f	Change versions for release	2019-11-18 15:56:03 -05:00
Marcin Grzejszczak	941bba5970	Merge branch '2.1.x'	2019-11-18 15:02:51 +01:00
Marcin Grzejszczak	1235c2153a	Added gpg version	2019-11-18 15:02:17 +01:00
Marcin Grzejszczak	3312992760	Merge branch '2.1.x'	2019-11-18 14:50:59 +01:00
Marcin Grzejszczak	717978e9eb	Added gpg version	2019-11-18 14:48:27 +01:00
buildmaster	af4bc6f95c	Bumping versions	2019-11-13 07:13:23 +00:00
Marcin Grzejszczak	1afb77ea41	Making all the attributes overridable	2019-11-12 14:01:35 +01:00
Ryan Baxter	33b42d3a4b	Bumping version to 2.1.9	2019-11-11 11:39:54 -05:00
Ryan Baxter	079317a3fe	Revert "Preparing for 2.1.8.RELEASE" This reverts commit `5d8b1fa812`.	2019-11-11 11:38:09 -05:00
Ryan Baxter	5d8b1fa812	Preparing for 2.1.8.RELEASE	2019-11-11 11:22:49 -05:00
Ryan Baxter	c6a0a473ec	Bumping boot to 2.1.10.RELEASE	2019-11-11 11:15:54 -05:00
buildmaster	b167397c23	Going back to snapshots	2019-11-07 16:31:13 +00:00
buildmaster	b02a62f33d	Update SNAPSHOT to 2.2.0.RC2	2019-11-07 16:25:52 +00:00
Marcin Grzejszczak	d810f71a84	Fixed the boms to be of flattenMode=bom	2019-11-07 15:07:41 +01:00
Marcin Grzejszczak	cc07cbcde5	Bumped Boot to 2.2.1.RELEASE	2019-11-07 14:14:59 +01:00
Marcin Grzejszczak	9d88a2c0de	Using the maven flatten plugin for published POMs To avoid propagating build setup that is required to build a Spring Cloud project, the maven flatten plugin can be used. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository. fixes gh-89	2019-11-07 14:12:44 +01:00
buildmaster	8a3f69227e	Going back to snapshots	2019-10-23 20:01:31 +00:00