Revert "Use https://repo.spring.io/snapshot "

This reverts commit fc23298240.
Use https://repo.spring.io/snapshot
2026-09-17 21:09:00 +00:00 · 2020-07-30 10:30:10 -04:00 · 2020-07-29 16:01:52 -04:00 · 2020-05-13 15:17:42 -04:00 · 2020-05-08 13:45:06 -04:00 · 2020-05-08 13:40:16 -04:00
32 changed files with 331 additions and 150 deletions
@@ -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.
@@ -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
@@ -293,36 +311,38 @@ 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 -->
 	<!-- 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>
+	<!-- Once we go to docs.spring.io should be changed to -->
+	<!-- https://docs.spring.io/${docs.main}/${project.version} -->
+	<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>
 </attributes>
 ----

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -10,14 +10,17 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.2.4.BUILD-SNAPSHOT</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>
+		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
+		<groovy.version>2.5.9</groovy.version>
+		<!-- For the Groovy plugin -->
+		<groovyVersion>${groovy.version}</groovyVersion>
 		<!-- 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>
@@ -35,24 +38,64 @@
 			<artifactId>spring-core</artifactId>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>${groovy.version}</version>
+			<type>pom</type>
+		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-xml</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-datetime</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-nio</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-json</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-jsr223</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-macro</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-sql</artifactId>
+			<version>${groovy.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-swing</artifactId>
+			<version>${groovy.version}</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -99,6 +142,9 @@
 						<goals>
 							<goal>compile</goal>
 							<goal>addSources</goal>
+							<goal>generateStubs</goal>
+							<goal>generateTestStubs</goal>
+							<goal>groovydoc-jar</goal>
 						</goals>
 					</execution>
 				</executions>
@@ -163,7 +209,6 @@
 								</goals>
 								<configuration>
 									<skip>${skipTests}</skip>
-									<!-- <skip>true</skip> -->
 									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
 								</configuration>
 							</execution>
@@ -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
@@ -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.2.7.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.2.7.RELEASE</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>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.2.7.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.2.7.RELEASE</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>
@@ -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>
@@ -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.2.2.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.2.2.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.1.RELEASE</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.SR1</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.SR1</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.SR1</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.SR1</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.SR1</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.SR1</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.SR1</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.2.2.BUILD-SNAPSHOT</version>
    <parent>
        <groupId>org.springframework.cloud</groupId>
        <artifactId>spring-cloud-build</artifactId>
-        <version>2.2.0.BUILD-SNAPSHOT</version>
+        <version>2.2.2.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.SR1</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.2.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,11 +28,11 @@
 		<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.2.7.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.2.4.BUILD-SNAPSHOT</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-doc-resources.version>0.2.1.RELEASE</spring-doc-resources.version>
 		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
 		</spring-asciidoctor-extensions.version>
 		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
@@ -102,6 +102,9 @@
 		<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>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -253,42 +256,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>
@@ -867,6 +861,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>
@@ -1070,36 +1081,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 -->
 									<!-- 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>${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>
 								</attributes>
 								<!-- end::attributes[] -->
 								<requires>
@@ -1119,7 +1130,7 @@
 											<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>
@@ -1153,7 +1164,7 @@
 											<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>
@@ -1179,7 +1190,7 @@
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
+										<outputDirectory>${generated-docs-pdf-output.dir}
 										</outputDirectory>
 										<resources>
 											<resource>
@@ -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.2.4.BUILD-SNAPSHOT</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.2.7.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.2.7.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.2.4.BUILD-SNAPSHOT</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.2.4.BUILD-SNAPSHOT</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
Ryan Baxter	3a4d022702	Revert "Use https://repo.spring.io/snapshot " This reverts commit `fc23298240`.	2020-07-30 10:30:10 -04:00
Ryan Baxter	fc23298240	Use https://repo.spring.io/snapshot	2020-07-29 16:01:52 -04:00
spencergibb	d11a135437	Bumps boot to version to 2.2.7.RELEASE	2020-05-13 15:17:42 -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
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
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	a33e77df15	Revert "Bumps boot version to 2.3.0.M3" This reverts commit `2f67da30`	2020-03-19 10:33:25 -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