Update SNAPSHOT to 2.1.1.RELEASE

Updates the pom.xmls to start generating documentation in the new way

.editorconfig

@@ -0,0 +1,16 @@
+root=true
+
+[*.java]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.groovy]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8

.gitignore

@@ -16,3 +16,4 @@ _site/
 .idea
 *.iml
 .factorypath
+.vscode/

README.adoc

@@ -109,13 +109,9 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
 					</plugin>
-					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId> <3>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <4>
+						<artifactId>maven-antrun-plugin</artifactId> <3>
 						<inherited>false</inherited>
 					</plugin>
 				</plugins>
@@ -125,7 +121,6 @@ approach of generating documentation just add these plugins to your `docs` modul
 ----
 <1> This plugin downloads and unpacks the resources of the `spring-cloud-build-docs` module
 <2> This plugin is required to parse the Asciidoctor documentation
-<3> This plugin converts the Asciidoctor documentation into single and multi page docs
-<4> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
+<3> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
 
 IMPORTANT: The order of plugin declaration is important!

docs/pom.xml

@@ -9,12 +9,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.1.1.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</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 		<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
 	</properties>

docs/src/main/asciidoc/README.adoc

@@ -64,13 +64,9 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
 					</plugin>
-					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId> <3>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <4>
+						<artifactId>maven-antrun-plugin</artifactId> <3>
 						<inherited>false</inherited>
 					</plugin>
 				</plugins>
@@ -80,7 +76,6 @@ approach of generating documentation just add these plugins to your `docs` modul
 ----
 <1> This plugin downloads and unpacks the resources of the `spring-cloud-build-docs` module
 <2> This plugin is required to parse the Asciidoctor documentation
-<3> This plugin converts the Asciidoctor documentation into single and multi page docs
-<4> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
+<3> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
 
 IMPORTANT: The order of plugin declaration is important!

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

@@ -1,33 +0,0 @@
-==== Adding Project Lombok Agent
-
-Spring Cloud uses http://projectlombok.org/features/index.html[Project Lombok]
-to generate getters and setters etc. Compiling from the command line this
-shouldn't cause any problems, but in an IDE you need to add an agent
-to the JVM. Full instructions can be found in the Lombok website. The
-sign that you need to do this is a lot of compiler errors to do with
-missing methods and fields, e.g.
-
-[indent=0]
-----
-The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 120    Java Problem
-The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 121    Java Problem
-The method setNonSecurePort(int) is undefined for the type EurekaInstanceConfigBean EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 112    Java Problem
-The type EurekaInstanceConfigBean.IdentifyingDataCenterInfo must implement the inherited abstract method DataCenterInfo.getName()   EurekaInstanceConfigBean.java   /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 131    Java Problem
-The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec   PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 60 Java Problem
-The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem
-----
-
-==== Importing into Intellij
-Spring Cloud projects use annotation processing, particularly Lombok, which requires configuration
-or you will encounter compile problems. It also needs a specific version of maven and a profile
-enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly.
-
- 1. Click Preferences, Plugins. *Ensure Lombok is installed*
- 2. Click New, Project from Existing Sources, choose your spring-cloud project directory
- 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3*
- 4. In the next screen, *Select the profile `spring`* click Next until Finish.
- 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing*
- 6. Click Build, Rebuild Project, and you are ready to go!
-
-==== Importing into other IDEs
-Maven is well supported by most Java IDEs. Refer to you vendor documentation.

docs/src/main/asciidoc/ghpages.sh

@@ -32,10 +32,23 @@ function set_default_props() {
     echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
 }
 
+# Adds the oauth token if present to the remote url
+function add_oauth_token_to_remote_url() {
+    remote=`git config remote.origin.url | sed -e 's/^git:/https:/'`
+    echo "Current remote [${remote}]"
+    if [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" && ${remote} != *"@"* ]]; then
+        echo "OAuth token found. Will reuse it to push the code"
+        withToken=${remote/https:\/\//https://${RELEASER_GIT_OAUTH_TOKEN}@}
+        git remote set-url --push origin "${withToken}"
+    else
+        echo "No OAuth token found"
+        git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+    fi
+}
+
 # Check if gh-pages exists and docs have been built
 function check_if_anything_to_sync() {
-    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
-
+    add_oauth_token_to_remote_url
     if ! (git remote set-branches --add origin gh-pages && git fetch -q) && [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
         echo "No gh-pages, so not syncing"
         exit 0
@@ -240,6 +253,7 @@ function commit_changes_if_applicable() {
         # This is a little extreme. Use with care!
         ###################################################################
         if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
+            add_oauth_token_to_remote_url
             git push origin gh-pages
         fi
     fi

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.1.1.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -20,15 +20,12 @@
 		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-		<checkstyle.version>2.17</checkstyle.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.0.4.BUILD-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.1.1.RELEASE</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 
 		<!-- Sonar -->
@@ -36,6 +33,36 @@
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
+
+		<!-- Plugins -->
+		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
+		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
+		<puppycrawl-tools-checkstyle.version>8.12</puppycrawl-tools-checkstyle.version>
+		<spring-javaformat.version>0.0.6</spring-javaformat.version>
+		<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
+		<maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
+		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
+		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+		<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
+		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+		<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+		<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+		<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+		<asciidoctor-maven-plugin.version>1.5.7</asciidoctor-maven-plugin.version>
+		<docbkx-maven-plugin.version>2.0.17</docbkx-maven-plugin.version>
+		<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
+		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
+		<license-maven-plugin.version>1.16</license-maven-plugin.version>
+		<spring-javaformat-checkstyle.version>0.0.6</spring-javaformat-checkstyle.version>
+		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+		<disable.checks>false</disable.checks>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -148,7 +175,7 @@ limitations under the License.
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>${maven-javadoc-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>javadoc</id>
@@ -159,12 +186,14 @@ limitations under the License.
 					</execution>
 				</executions>
 				<configuration>
+					<!-- TODO: We need to patch the javadocs instead of disabling this -->
+					<failOnError>false</failOnError>
 					<quiet>true</quiet>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
+				<version>${maven-source-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -187,6 +216,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
+					<version>${maven-compiler-plugin.version}</version>
 					<configuration>
 						<source>${maven.compiler.source}</source>
 						<target>${maven.compiler.target}</target>
@@ -196,6 +226,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>${maven-failsafe-plugin.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -208,7 +239,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>${maven-jar-plugin.version}</version>
 					<configuration>
 						<archive>
 							<manifest>
@@ -221,11 +252,12 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.7</version>
+					<version>${maven-antrun-plugin.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
+					<version>${maven-surefire-plugin.version}</version>
 					<configuration>
 						<includes>
 							<include>**/*Tests.java</include>
@@ -239,6 +271,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
+					<version>${maven-war-plugin.version}</version>
 					<configuration>
 						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
@@ -252,6 +285,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
+					<version>${exec-maven-plugin.version}</version>
 					<configuration>
 						<mainClass>${start-class}</mainClass>
 					</configuration>
@@ -259,7 +293,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
+					<version>${maven-resources-plugin.version}</version>
 					<configuration>
 						<delimiters>
 							<delimiter>${resource.delimiter}</delimiter>
@@ -267,37 +301,69 @@ limitations under the License.
 						<useDefaultDelimiters>false</useDefaultDelimiters>
 					</configuration>
 				</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>${checkstyle.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.cloud</groupId>
-						<artifactId>spring-cloud-build-tools</artifactId>
-						<version>${spring-cloud-build.version}</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<configLocation>checkstyle.xml</configLocation>
-					<headerLocation>LICENSE.txt</headerLocation>
-					<consoleOutput>true</consoleOutput>
-					<failsOnError>true</failsOnError>
-				</configuration>
-				<executions>
-					<execution>
-						<id>validate</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<version>${maven-checkstyle-plugin.version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>com.puppycrawl.tools</groupId>
+							<artifactId>checkstyle</artifactId>
+							<version>${puppycrawl-tools-checkstyle.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>io.spring.javaformat</groupId>
+							<artifactId>spring-javaformat-checkstyle</artifactId>
+							<version>${spring-javaformat-checkstyle.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.springframework.cloud</groupId>
+							<artifactId>spring-cloud-build-tools</artifactId>
+							<version>${spring-cloud-build.version}</version>
+						</dependency>
+					</dependencies>
+					<executions>
+						<execution>
+							<id>checkstyle-validation</id>
+							<phase>validate</phase>
+							<inherited>true</inherited>
+							<configuration>
+								<configLocation>checkstyle.xml</configLocation>
+								<headerLocation>checkstyle-header.txt</headerLocation>
+								<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
+								<consoleOutput>true</consoleOutput>
+								<!-- TODO: Start fixing the errors -->
+								<includeTestSourceDirectory>false</includeTestSourceDirectory>
+								<failsOnError>false</failsOnError>
+								<failOnViolation>false</failOnViolation>
+							</configuration>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>io.spring.javaformat</groupId>
+					<artifactId>spring-javaformat-maven-plugin</artifactId>
+					<version>${spring-javaformat.version}</version>
+					<executions>
+						<execution>
+							<phase>validate</phase>
+							<configuration>
+								<skip>${disable.checks}</skip>
+							</configuration>
+							<goals>
+								<goal>apply</goal>
+								<goal>validate</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<plugin>
 					<groupId>pl.project13.maven</groupId>
 					<artifactId>git-commit-id-plugin</artifactId>
-					<version>2.1.11</version>
+					<version>${git-commit-id-plugin.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -332,7 +398,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>2.2</version>
+					<version>${maven-shade-plugin.version}</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
@@ -383,7 +449,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.4.1</version>
+					<version>${maven-enforcer-plugin.version}</version>
 					<executions>
 						<execution>
 							<id>enforce-versions</id>
@@ -539,6 +605,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -588,6 +655,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>imports</id>
@@ -625,7 +693,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-dependency-plugin</artifactId>
-							<version>3.0.0</version>
+							<version>${maven-dependency-plugin.version}</version>
 							<executions>
 								<execution>
 									<id>unpack-docs</id>
@@ -652,7 +720,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctor-maven-plugin</artifactId>
-							<version>1.5.5</version>
+							<version>${asciidoctor-maven-plugin.version}</version>
 							<dependencies>
 								<dependency>
 									<groupId>io.spring.asciidoctor</groupId>
@@ -706,7 +774,7 @@ limitations under the License.
 						<plugin>
 							<groupId>com.agilejava.docbkx</groupId>
 							<artifactId>docbkx-maven-plugin</artifactId>
-							<version>2.0.15</version>
+							<version>${docbkx-maven-plugin.version}</version>
 							<configuration>
 								<sourceDirectory>${basedir}/target/generated-docs</sourceDirectory>
 								<includes>${docs.main}.xml</includes>
@@ -793,12 +861,13 @@ limitations under the License.
 						<plugin>
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>1.12</version>
+							<version>${build-helper-maven-plugin.version}</version>
 							<inherited>false</inherited>
 						</plugin>
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-antrun-plugin</artifactId>
+							<version>${maven-antrun-plugin.version}</version>
 							<dependencies>
 								<dependency>
 									<groupId>ant-contrib</groupId>
@@ -966,7 +1035,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>
-							<version>2.2.1</version>
+							<version>${artifactory-maven-plugin.version}</version>
 							<executions>
 								<execution>
 									<id>build-info</id>
@@ -1018,6 +1087,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${maven-surefire-plugin.version}</version>
 						<configuration>
 							<properties>
 								<property>
@@ -1048,7 +1118,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>license-maven-plugin</artifactId>
-						<version>1.8</version>
+						<version>${license-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>aggregate-licenses</id>

spring-cloud-build-dependencies/pom.xml

@@ -5,19 +5,19 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.1.1.RELEASE</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring Cloud projects. Use as a BOM or by inheriting from the spring-cloud build parent.</description>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.0.5.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<lombok.version>1.16.14</lombok.version>
-		<spring-boot.version>2.0.5.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -32,11 +32,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>${lombok.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<distributionManagement>

spring-cloud-build-tools/pom.xml

@@ -11,13 +11,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.4.BUILD-SNAPSHOT</version>
+		<version>2.1.1.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.puppycrawl.tools</groupId>
 			<artifactId>checkstyle</artifactId>
-			<version>7.6</version>
+			<version>${puppycrawl-tools-checkstyle.version}</version>
 		</dependency>
 	</dependencies>
 	

spring-cloud-build-tools/src/main/resources/checkstyle-header.txt

@@ -0,0 +1,17 @@
+^\Q/*\E$
+^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q *\E$
+^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
+^\Q * you may not use this file except in compliance with the License.\E$
+^\Q * You may obtain a copy of the License at\E$
+^\Q *\E$
+^\Q *      http://www.apache.org/licenses/LICENSE-2.0\E$
+^\Q *\E$
+^\Q * Unless required by applicable law or agreed to in writing, software\E$
+^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
+^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
+^\Q * See the License for the specific language governing permissions and\E$
+^\Q * limitations under the License.\E$
+^\Q */\E$
+^$
+^.*$

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

@@ -2,24 +2,184 @@
 <!DOCTYPE module PUBLIC
 		"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
 		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-	<module name="TreeWalker">
-		<!-- this. in front of fields -->
-		<module name="RequireThis">
-			<property name="checkMethods" value="false"/>
-		</module>
-		<!-- tabs instead of spaces -->
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* "/>
-			<property name="message" value="Indent must use tab characters"/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="UnusedImports">
-			<property name="processJavadoc" value="true" />
-		</module>
-		<module name="RedundantImport"/>
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+
+	<module name="SuppressionFilter">
+		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
+		<property name="optional" value="true"/>
+	</module>
+
+	<!-- TAKEN FROM SPRING BOOT -->
+	<!-- Root Checks -->
+	<module name="com.puppycrawl.tools.checkstyle.checks.header.RegexpHeaderCheck">
+		<property name="headerFile" value="${checkstyle.header.file}" />
+		<property name="fileExtensions" value="java,groovy" />
+	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
+		<property name="lineSeparator" value="lf"/>
+	</module>
+
+	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck" >
 			<property name="illegalPkgs" value="com.google.common"/>
 		</module>
+
+		<!-- TAKEN FROM SPRING BOOT -->
+		<!-- Annotations -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck">
+			<property name="elementStyle" value="compact" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
+			<property name="allowSamelineSingleParameterlessAnnotation"
+					  value="false" />
+		</module>
+
+		<!-- Block Checks -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
+			<property name="option" value="text" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck">
+			<property name="option" value="alone" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck" />
+
+		<!-- Class Design -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck" />
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck" />-->
+
+		<!-- Coding -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck">
+			<property name="max" value="3" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck">
+			<property name="max" value="3" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
+			<property name="max" value="3" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
+			<property name="checkMethods" value="false" />
+			<property name="validateOnlyOverlapping" value="false" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck" />
+
+		<!-- Imports -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">
+			<property name="excludes"
+					  value="io.restassured.RestAssured.*, org.assertj.core.api.Assertions.*, org.junit.Assert.*, org.junit.Assume.*, org.junit.internal.matchers.ThrowableMessageMatcher.*, org.junit.jupiter.api.Assertions.*, org.hamcrest.CoreMatchers.*, org.hamcrest.Matchers.*, org.springframework.boot.configurationprocessor.ConfigurationMetadataMatchers.*, org.springframework.boot.configurationprocessor.TestCompiler.*, org.springframework.boot.test.autoconfigure.AutoConfigurationImportedCondition.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.ArgumentMatchers.*, org.mockito.Matchers.*, org.springframework.restdocs.headers.HeaderDocumentation.*, org.springframework.restdocs.hypermedia.HypermediaDocumentation.*, org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.*, org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*, org.springframework.restdocs.operation.preprocess.Preprocessors.*, org.springframework.restdocs.payload.PayloadDocumentation.*, org.springframework.restdocs.request.RequestDocumentation.*, org.springframework.restdocs.restassured3.operation.preprocess.RestAssuredPreprocessors.*, org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.*, org.springframework.restdocs.snippet.Attributes.*, org.springframework.restdocs.webtestclient.WebTestClientRestDocumentation.*, org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*, org.springframework.test.web.servlet.result.MockMvcResultMatchers.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*, org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo, org.springframework.test.web.client.ExpectedCount.*, org.springframework.test.web.client.match.MockRestRequestMatchers.*, org.springframework.test.web.client.response.MockRestResponseCreators.*, org.springframework.test.web.servlet.result.MockMvcResultHandlers.*, org.springframework.web.reactive.function.BodyInserters.*, org.springframework.web.reactive.function.server.RequestPredicates.*, org.springframework.web.reactive.function.server.RouterFunctions.*, org.springframework.test.web.servlet.setup.MockMvcBuilders.*" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck">
+			<property name="processJavadoc" value="true" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">
+			<property name="groups" value="java,/^javax?\./,*,org.springframework" />
+			<property name="ordered" value="true" />
+			<property name="separated" value="true" />
+			<property name="option" value="bottom" />
+			<property name="sortStaticImportsAlphabetically" value="true" />
+		</module>
+
+		<!-- Javadoc Comments -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
+			<property name="scope" value="package"/>
+			<property name="authorFormat" value=".+\s.+"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
+			<property name="allowMissingJavadoc" value="true" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
+			<property name="scope" value="public"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck">
+			<property name="checkEmptyJavadoc" value="true"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTagContinuationIndentationCheck">
+			<property name="offset" value="0"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
+			<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
+			<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
+			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+			<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
+		</module>
+
+		<!-- Miscellaneous -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck">
+			<property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck" />
+
+		<!-- Modifiers -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
+
+		<!-- Regexp -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="format" value="^\t* +\t*\S" />
+			<property name="message"
+					  value="Line has leading space characters; indentation should be performed with tabs only." />
+			<property name="ignoreComments" value="true" />
+		</module>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" />
+			<property name="message"
+					  value="Please use BDDMockito imports." />
+			<property name="ignoreComments" value="true" />
+		</module>-->
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert" />
+			<property name="message"
+					  value="Please use AssertJ imports." />
+			<property name="ignoreComments" value="true" />
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck">
+			<property name="format" value="[ \t]+$" />
+			<property name="illegalPattern" value="true" />
+			<property name="message" value="Trailing whitespace" />
+		</module>
+
+		<!-- Whitespace -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck" >
+			<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck" />
+
+		<!-- Spring Conventions -->
+		<module name="io.spring.javaformat.checkstyle.check.SpringLambdaCheck" />
+		<!--<module name="io.spring.javaformat.checkstyle.check.SpringTernaryCheck" />-->
+		<module name="io.spring.javaformat.checkstyle.check.SpringCatchCheck" />
+		<module name="io.spring.javaformat.checkstyle.check.SpringJavadocCheck" />
+		<module name="io.spring.javaformat.checkstyle.check.SpringMethodOrderCheck" />
 	</module>
 </module>

spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UnqualifiedFieldAccess" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml

@@ -0,0 +1,83 @@
+<code_scheme name="Spring Boot Java Conventions" version="173">
+  <option name="OTHER_INDENT_OPTIONS">
+    <value>
+      <option name="USE_TAB_CHARACTER" value="true" />
+    </value>
+  </option>
+  <option name="RIGHT_MARGIN" value="90" />
+  <option name="FORMATTER_TAGS_ENABLED" value="true" />
+  <GroovyCodeStyleSettings>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.springframework" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+  </GroovyCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="TEST_NAME_SUFFIX" value="Tests" />
+    <option name="VISIBILITY" value="packageLocal" />
+    <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.springframework" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
+  </JavaCodeStyleSettings>
+  <codeStyleSettings language="Groovy">
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+      <option name="LABEL_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="SPACE_WITHIN_BRACES" value="true" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+    <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

spring-cloud-dependencies-parent/pom.xml

@@ -3,7 +3,7 @@
 	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>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.0.4.BUILD-SNAPSHOT</version>
+	<version>2.1.1.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -64,9 +64,6 @@ limitations under the License.
 			</roles>
 		</developer>
 	</developers>
-	<prerequisites>
-		<maven>3.0.0</maven>
-	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>