Update SNAPSHOT to 2.1.4.RELEASE

URL Cleanup (#106 )
This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://www.apache.org/licenses/ with 2 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * [ ] http://www.apache.org/licenses/LICENSE-2.0 with 8 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).
2026-09-17 21:09:00 +00:00 · 2019-03-25 13:52:46 +00:00 · 2019-03-22 10:52:25 +01:00 · 2019-03-22 09:22:01 +01:00 · 2019-03-22 09:20:29 +01:00 · 2019-03-22 09:20:07 +01:00
52 changed files with 2237 additions and 1215 deletions
@@ -1,4 +1,4 @@
-root=true
+root = true

 [*.java]
 indent_style = tab
@@ -13,4 +13,12 @@ continuation_indent_size = 8
 [*.xml]
 indent_style = tab
 indent_size = 4
-continuation_indent_size = 8
+continuation_indent_size = 8
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.yaml]
+indent_style = space
+indent_size = 2
@@ -17,3 +17,4 @@ _site/
 *.iml
 .factorypath
 .vscode/
+.flattened-pom.xml
@@ -1,66 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <servers>
-	<server>
-	  <id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
-  </servers>
-  <profiles>
-	<profile>
-      <!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
-	  <id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
-	  <repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>http://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	  </repositories>
-	  <pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	  </pluginRepositories>
-    </profile>
-  </profiles>
+	<servers>
+		<server>
+			<id>repo.spring.io</id>
+			<username>${env.CI_DEPLOY_USERNAME}</username>
+			<password>${env.CI_DEPLOY_PASSWORD}</password>
+		</server>
+	</servers>
+	<profiles>
+		<profile>
+			<!--
+				N.B. this profile is only here to support users and IDEs that do not use Maven 3.3.
+				It isn't needed on the command line if you use the wrapper script (mvnw) or if you use
+				a native Maven with the right version. Eclipse users should points their Maven tooling to
+				this settings file, or copy the profile into their ~/.m2/settings.xml.
+			-->
+			<id>spring</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+	</profiles>
 </settings>
@@ -1,7 +1,7 @@

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       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,
@@ -1,4 +1,8 @@
-// Do not edit this file (e.g. go instead to src/main/asciidoc)
+////
+DO NOT EDIT THIS FILE. IT WAS GENERATED.
+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"]

@@ -42,6 +46,8 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

+:spring-cloud-build-branch: master
+
 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
 tracker for issues and merging pull requests into master. If you want
@@ -70,7 +76,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -83,10 +89,142 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
  message (where XXXX is the issue number).

+=== Checkstyle
+
+Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            └── checkstyle.xml <1>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+
+==== Checkstyle configuration
+
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
+
+.pom.xml
+----
+<properties>
+<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
+        <maven-checkstyle-plugin.failsOnViolation>true
+        </maven-checkstyle-plugin.failsOnViolation> <2>
+        <maven-checkstyle-plugin.includeTestSourceDirectory>true
+        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
+</properties>
+
+<build>
+        <plugins>
+            <plugin> <4>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+            </plugin>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    <reporting>
+        <plugins>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</build>
+----
+<1> Fails the build upon Checkstyle errors
+<2> Fails the build upon Checkstyle violations
+<3> Checkstyle analyzes also the test sources
+<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
+<5> Add checkstyle plugin to your build and reporting phases
+
+If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
+
+.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+----
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
+</suppressions>
+----
+
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
+
+```bash
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ touch .springformat
+```
+
+=== IDE setup
+
+==== Intellij IDEA
+
+In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            ├── checkstyle.xml <1>
+            └── intellij
+                ├── Intellij_Project_Defaults.xml <4>
+                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+<4> Project defaults for Intellij that apply most of Checkstyle rules
+<5> Project style conventions for Intellij that apply most of Checkstyle rules
+
+.Code style
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
+
+.Inspection profiles
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
+
+.Checkstyle
+
+To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
+
+Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
+
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
+
 == Reusing the documentation

 Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
@@ -1,6 +1,6 @@
 <?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">
+	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>
 	<artifactId>spring-cloud-build-docs</artifactId>
 	<name>spring-cloud-build-docs</name>
@@ -9,12 +9,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.RELEASE</version>
+		<version>2.1.4.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</docs.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>
 		<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
 	</properties>
@@ -1,3 +1,5 @@
+:spring-cloud-build-branch: master
+
 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
 tracker for issues and merging pull requests into master. If you want
@@ -42,3 +44,135 @@ added after the original pull request but before a merge.
 * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
  message (where XXXX is the issue number).
+
+=== Checkstyle
+
+Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            └── checkstyle.xml <1>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+
+==== Checkstyle configuration
+
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
+
+.pom.xml
+----
+<properties>
+<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
+        <maven-checkstyle-plugin.failsOnViolation>true
+        </maven-checkstyle-plugin.failsOnViolation> <2>
+        <maven-checkstyle-plugin.includeTestSourceDirectory>true
+        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
+</properties>
+
+<build>
+        <plugins>
+            <plugin> <4>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+            </plugin>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    <reporting>
+        <plugins>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</build>
+----
+<1> Fails the build upon Checkstyle errors
+<2> Fails the build upon Checkstyle violations
+<3> Checkstyle analyzes also the test sources
+<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
+<5> Add checkstyle plugin to your build and reporting phases
+
+If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
+
+.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+----
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
+</suppressions>
+----
+
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
+
+```bash
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ touch .springformat
+```
+
+=== IDE setup
+
+==== Intellij IDEA
+
+In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            ├── checkstyle.xml <1>
+            └── intellij
+                ├── Intellij_Project_Defaults.xml <4>
+                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+<4> Project defaults for Intellij that apply most of Checkstyle rules
+<5> Project style conventions for Intellij that apply most of Checkstyle rules
+
+.Code style
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
+
+.Inspection profiles
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
+
+.Checkstyle
+
+To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
+
+Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
+
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
@@ -62,7 +62,7 @@ function check_if_anything_to_sync() {

 function retrieve_current_branch() {
    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
    # If there is a branch already passed will reuse it - otherwise will try to find it
    CURRENT_BRANCH=${BRANCH}
    if [[ -z "${CURRENT_BRANCH}" ]] ; then
@@ -181,7 +181,7 @@ function copy_docs_for_current_version() {
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
@@ -4,32 +4,32 @@
 */

 .hl-keyword {
-  color: #7F0055;
-  font-weight: bold; 
+    color: #7F0055;
+    font-weight: bold;
 }

 .hl-comment {
-  color: #3F5F5F;
-  font-style: italic;
+    color: #3F5F5F;
+    font-style: italic;
 }

 .hl-multiline-comment {
-  color: #3F5FBF;
-  font-style: italic;
+    color: #3F5FBF;
+    font-style: italic;
 }

 .hl-tag {
-  color: #3F7F7F;
+    color: #3F7F7F;
 }

 .hl-attribute {
-  color: #7F007F;
+    color: #7F007F;
 }

 .hl-value {
-  color: #2A00FF;
+    color: #2A00FF;
 }

 .hl-string {
-  color: #2A00FF;
+    color: #2A00FF;
 }
@@ -1,7 +1,7 @@
@IMPORT url("manual.css");

 body.firstpage {
-	background: url("../images/background.png") no-repeat center top;
+    background: url("../images/background.png") no-repeat center top;
 }

 div.part h1 {
@@ -1,6 +1,6 @@
@IMPORT url("manual.css");

 body {
-	background: url("../images/background.png") no-repeat center top;
+    background: url("../images/background.png") no-repeat center top;
 }

@@ -1,344 +1,342 @@
@IMPORT url("highlight.css");

 html {
-	padding: 0pt;
-	margin: 0pt;
+    padding: 0pt;
+    margin: 0pt;
 }

 body {
-	color: #333333;
-	margin: 15px 30px;
-	font-family: Helvetica, Arial, Freesans, Clean, Sans-serif;
-	line-height: 1.6;
-	-webkit-font-smoothing: antialiased;
+    color: #333333;
+    margin: 15px 30px;
+    font-family: Helvetica, Arial, Freesans, Clean, Sans-serif;
+    line-height: 1.6;
+    -webkit-font-smoothing: antialiased;
 }

 code {
-	font-size: 16px;
-	font-family: Consolas, "Liberation Mono", Courier, monospace;
+    font-size: 16px;
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
 }

-:not(a)>code {
-	color: #6D180B;
+:not(a) > code {
+    color: #6D180B;
 }

-:not(pre)>code {
-	background-color: #F2F2F2;
-	border: 1px solid #CCCCCC;
-	border-radius: 4px;
-	padding: 1px 3px 0;
-	text-shadow: none;
-	white-space: nowrap;
+:not(pre) > code {
+    background-color: #F2F2F2;
+    border: 1px solid #CCCCCC;
+    border-radius: 4px;
+    padding: 1px 3px 0;
+    text-shadow: none;
+    white-space: nowrap;
 }

-body>*:first-child {
-	margin-top: 0 !important;
+body > *:first-child {
+    margin-top: 0 !important;
 }

 div {
-	margin: 0pt;
+    margin: 0pt;
 }

 hr {
-	border: 1px solid #CCCCCC;
-	background: #CCCCCC;
+    border: 1px solid #CCCCCC;
+    background: #CCCCCC;
 }

-h1,h2,h3,h4,h5,h6 {
-	color: #000000;
-	cursor: text;
-	font-weight: bold;
-	margin: 30px 0 10px;
-	padding: 0;
+h1, h2, h3, h4, h5, h6 {
+    color: #000000;
+    cursor: text;
+    font-weight: bold;
+    margin: 30px 0 10px;
+    padding: 0;
 }

-h1,h2,h3 {
-	margin: 40px 0 10px;
+h1, h2, h3 {
+    margin: 40px 0 10px;
 }

 h1 {
-	margin: 70px 0 30px;
-	padding-top: 20px;
+    margin: 70px 0 30px;
+    padding-top: 20px;
 }

 div.part h1 {
-	border-top: 1px dotted #CCCCCC;
+    border-top: 1px dotted #CCCCCC;
 }

-h1,h1 code {
-	font-size: 32px;
+h1, h1 code {
+    font-size: 32px;
 }

-h2,h2 code {
-	font-size: 24px;
+h2, h2 code {
+    font-size: 24px;
 }

-h3,h3 code {
-	font-size: 20px;
+h3, h3 code {
+    font-size: 20px;
 }

-h4,h1 code,h5,h5 code,h6,h6 code {
-	font-size: 18px;
+h4, h1 code, h5, h5 code, h6, h6 code {
+    font-size: 18px;
 }

-div.book,div.chapter,div.appendix,div.part,div.preface {
-	min-width: 300px;
-	max-width: 1200px;
-	margin: 0 auto;
+div.book, div.chapter, div.appendix, div.part, div.preface {
+    min-width: 300px;
+    max-width: 1200px;
+    margin: 0 auto;
 }

 p.releaseinfo {
-	font-weight: bold;
-	margin-bottom: 40px;
-	margin-top: 40px;
+    font-weight: bold;
+    margin-bottom: 40px;
+    margin-top: 40px;
 }

 div.authorgroup {
-	line-height: 1;
+    line-height: 1;
 }

 p.copyright {
-	line-height: 1;
-	margin-bottom: -5px;
+    line-height: 1;
+    margin-bottom: -5px;
 }

 .legalnotice p {
-	font-style: italic;
-	font-size: 14px;
-	line-height: 1;
+    font-style: italic;
+    font-size: 14px;
+    line-height: 1;
 }

-div.titlepage+p,div.titlepage+p {
-	margin-top: 0;
+div.titlepage + p, div.titlepage + p {
+    margin-top: 0;
 }

 pre {
-	line-height: 1.0;
-	color: black;
+    line-height: 1.0;
+    color: black;
 }

 a {
-	color: #4183C4;
-	text-decoration: none;
+    color: #4183C4;
+    text-decoration: none;
 }

 p {
-	margin: 15px 0;
-	text-align: left;
+    margin: 15px 0;
+    text-align: left;
 }

-ul,ol {
-	padding-left: 30px;
+ul, ol {
+    padding-left: 30px;
 }

 li p {
-	margin: 0;
+    margin: 0;
 }

 div.table {
-	margin: 1em;
-	padding: 0.5em;
-	text-align: center;
+    margin: 1em;
+    padding: 0.5em;
+    text-align: center;
 }

-div.table table,div.informaltable table {
-	display: table;
-	width: 100%;
+div.table table, div.informaltable table {
+    display: table;
+    width: 100%;
 }

 div.table td {
-	padding-left: 7px;
-	padding-right: 7px;
+    padding-left: 7px;
+    padding-right: 7px;
 }

 .sidebar {
-	line-height: 1.4;
-	padding: 0 20px;
-	background-color: #F8F8F8;
-	border: 1px solid #CCCCCC;
-	border-radius: 3px 3px 3px 3px;
+    line-height: 1.4;
+    padding: 0 20px;
+    background-color: #F8F8F8;
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
 }

 .sidebar p.title {
-	color: #6D180B;
+    color: #6D180B;
 }

-pre.programlisting,pre.screen {
-	font-size: 15px;
-	padding: 6px 10px;
-	background-color: #F8F8F8;
-	border: 1px solid #CCCCCC;
-	border-radius: 3px 3px 3px 3px;
-	clear: both;
-	overflow: auto;
-	line-height: 1.4;
-	font-family: Consolas, "Liberation Mono", Courier, monospace;
+pre.programlisting, pre.screen {
+    font-size: 15px;
+    padding: 6px 10px;
+    background-color: #F8F8F8;
+    border: 1px solid #CCCCCC;
+    border-radius: 3px 3px 3px 3px;
+    clear: both;
+    overflow: auto;
+    line-height: 1.4;
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
 }

 table {
-	border-collapse: collapse;
-	border-spacing: 0;
-	border: 1px solid #DDDDDD !important;
-	border-radius: 4px !important;
-	border-collapse: separate !important;
-	line-height: 1.6;
+    border-collapse: collapse;
+    border-spacing: 0;
+    border: 1px solid #DDDDDD !important;
+    border-radius: 4px !important;
+    border-collapse: separate !important;
+    line-height: 1.6;
 }

 table thead {
-	background: #F5F5F5;
+    background: #F5F5F5;
 }

 table tr {
-	border: none;
-	border-bottom: none;
+    border: none;
+    border-bottom: none;
 }

 table th {
-	font-weight: bold;
+    font-weight: bold;
 }

-table th,table td {
-	border: none !important;
-	padding: 6px 13px;
+table th, table td {
+    border: none !important;
+    padding: 6px 13px;
 }

 table tr:nth-child(2n) {
-	background-color: #F8F8F8;
+    background-color: #F8F8F8;
 }

 td p {
-	margin: 0 0 15px 0;
+    margin: 0 0 15px 0;
 }

 div.table-contents td p {
-	margin: 0;
+    margin: 0;
 }

-div.important *,div.note *,div.tip *,div.warning *,div.navheader *,div.navfooter *,div.calloutlist *
-	{
-	border: none !important;
-	background: none !important;
-	margin: 0;
+div.important *, div.note *, div.tip *, div.warning *, div.navheader *, div.navfooter *, div.calloutlist * {
+    border: none !important;
+    background: none !important;
+    margin: 0;
 }

-div.important p,div.note p,div.tip p,div.warning p {
-	color: #6F6F6F;
-	line-height: 1.6;
+div.important p, div.note p, div.tip p, div.warning p {
+    color: #6F6F6F;
+    line-height: 1.6;
 }

-div.important code,div.note code,div.tip code,div.warning code {
-	background-color: #F2F2F2 !important;
-	border: 1px solid #CCCCCC !important;
-	border-radius: 4px !important;
-	padding: 1px 3px 0 !important;
-	text-shadow: none !important;
-	white-space: nowrap !important;
+div.important code, div.note code, div.tip code, div.warning code {
+    background-color: #F2F2F2 !important;
+    border: 1px solid #CCCCCC !important;
+    border-radius: 4px !important;
+    padding: 1px 3px 0 !important;
+    text-shadow: none !important;
+    white-space: nowrap !important;
 }

-.note th,.tip th,.warning th {
-	display: none;
+.note th, .tip th, .warning th {
+    display: none;
 }

-.note tr:first-child td,.tip tr:first-child td,.warning tr:first-child td
-	{
-	border-right: 1px solid #CCCCCC !important;
-	padding-top: 10px;
+.note tr:first-child td, .tip tr:first-child td, .warning tr:first-child td {
+    border-right: 1px solid #CCCCCC !important;
+    padding-top: 10px;
 }

-div.calloutlist p,div.calloutlist td {
-	padding: 0;
-	margin: 0;
+div.calloutlist p, div.calloutlist td {
+    padding: 0;
+    margin: 0;
 }

-div.calloutlist>table>tbody>tr>td:first-child {
-	padding-left: 10px;
-	width: 30px !important;
+div.calloutlist > table > tbody > tr > td:first-child {
+    padding-left: 10px;
+    width: 30px !important;
 }

-div.important,div.note,div.tip,div.warning {
-	margin-left: 0px !important;
-	margin-right: 20px !important;
-	margin-top: 20px;
-	margin-bottom: 20px;
-	padding-top: 10px;
-	padding-bottom: 10px;
+div.important, div.note, div.tip, div.warning {
+    margin-left: 0px !important;
+    margin-right: 20px !important;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
 }

 div.toc {
-	line-height: 1.2;
+    line-height: 1.2;
 }

-dl,dt {
-	margin-top: 1px;
-	margin-bottom: 0;
+dl, dt {
+    margin-top: 1px;
+    margin-bottom: 0;
 }

-div.toc>dl>dt {
-	font-size: 32px;
-	font-weight: bold;
-	margin: 30px 0 10px 0;
-	display: block;
+div.toc > dl > dt {
+    font-size: 32px;
+    font-weight: bold;
+    margin: 30px 0 10px 0;
+    display: block;
 }

-div.toc>dl>dd>dl>dt {
-	font-size: 24px;
-	font-weight: bold;
-	margin: 20px 0 10px 0;
-	display: block;
+div.toc > dl > dd > dl > dt {
+    font-size: 24px;
+    font-weight: bold;
+    margin: 20px 0 10px 0;
+    display: block;
 }

-div.toc>dl>dd>dl>dd>dl>dt {
-	font-weight: bold;
-	font-size: 20px;
-	margin: 10px 0 0 0;
+div.toc > dl > dd > dl > dd > dl > dt {
+    font-weight: bold;
+    font-size: 20px;
+    margin: 10px 0 0 0;
 }

 tbody.footnotes * {
-	border: none !important;
+    border: none !important;
 }

 div.footnote p {
-	margin: 0;
-	line-height: 1;
+    margin: 0;
+    line-height: 1;
 }

 div.footnote p sup {
-	margin-right: 6px;
-	vertical-align: middle;
+    margin-right: 6px;
+    vertical-align: middle;
 }

 div.navheader {
-	border-bottom: 1px solid #CCCCCC;
+    border-bottom: 1px solid #CCCCCC;
 }

 div.navfooter {
-	border-top: 1px solid #CCCCCC;
+    border-top: 1px solid #CCCCCC;
 }

 .title {
-	margin-left: -1em;
-	padding-left: 1em;
+    margin-left: -1em;
+    padding-left: 1em;
 }

-.title>a {
-	position: absolute;
-	visibility: hidden;
-	display: block;
-	font-size: 0.85em;
-	margin-top: 0.05em;
-	margin-left: -1em;
-	vertical-align: text-top;
-	color: black;
+.title > a {
+    position: absolute;
+    visibility: hidden;
+    display: block;
+    font-size: 0.85em;
+    margin-top: 0.05em;
+    margin-left: -1em;
+    vertical-align: text-top;
+    color: black;
 }

-.title>a:before {
-	content: "\00A7";
+.title > a:before {
+    content: "\00A7";
 }

-.title:hover>a,.title>a:hover,.title:hover>a:hover {
-	visibility: visible;
+.title:hover > a, .title > a:hover, .title:hover > a:hover {
+    visibility: visible;
 }

-.title:focus>a,.title>a:focus,.title:focus>a:focus {
-	outline: 0;
+.title:focus > a, .title > a:focus, .title:focus > a:focus {
+    outline: 0;
 }
@@ -9,7 +9,7 @@
 "License"); you may not use this file except in compliance
 with the License.  You may obtain a copy of the License at

-   http://www.apache.org/licenses/LICENSE-2.0
+   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
@@ -20,10 +20,10 @@
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:xslthl="http://xslthl.sf.net"
-		xmlns:d="http://docbook.org/ns/docbook"
-		exclude-result-prefixes="xslthl d"
-		version='1.0'>
+				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:d="http://docbook.org/ns/docbook"
+				exclude-result-prefixes="xslthl d"
+				version='1.0'>

 	<!-- Extensions -->
 	<xsl:param name="use.extensions">1</xsl:param>
@@ -9,7 +9,7 @@ to you 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

-http://www.apache.org/licenses/LICENSE-2.0
+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
@@ -20,10 +20,10 @@ under the License.
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:xslthl="http://xslthl.sf.net"
-		xmlns:d="http://docbook.org/ns/docbook"
-		exclude-result-prefixes="xslthl d"
-		version='1.0'>
+				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:d="http://docbook.org/ns/docbook"
+				exclude-result-prefixes="xslthl d"
+				version='1.0'>

 	<xsl:import href="urn:docbkx:stylesheet"/>
 	<xsl:import href="common.xsl"/>
@@ -9,7 +9,7 @@ to you 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

-http://www.apache.org/licenses/LICENSE-2.0
+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
@@ -39,12 +39,12 @@ under the License.
 			<xsl:apply-imports/>
 		</xsl:param>

-  		<xsl:call-template name="user.preroot"/>
+		<xsl:call-template name="user.preroot"/>

 		<html>
 			<xsl:call-template name="html.head">
-			<xsl:with-param name="prev" select="$prev"/>
-			<xsl:with-param name="next" select="$next"/>
+				<xsl:with-param name="prev" select="$prev"/>
+				<xsl:with-param name="next" select="$next"/>
 			</xsl:call-template>
 			<body>
 				<xsl:if test="count($prev) = 0">
@@ -9,7 +9,7 @@ to you 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

-http://www.apache.org/licenses/LICENSE-2.0
+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
@@ -9,7 +9,7 @@ to you 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

-http://www.apache.org/licenses/LICENSE-2.0
+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
@@ -20,10 +20,10 @@ under the License.
 -->

 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:xslthl="http://xslthl.sf.net"
-		xmlns:d="http://docbook.org/ns/docbook"
-		exclude-result-prefixes="xslthl"
-		version='1.0'>
+				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:d="http://docbook.org/ns/docbook"
+				exclude-result-prefixes="xslthl"
+				version='1.0'>

 	<xsl:import href="urn:docbkx:stylesheet/highlight.xsl"/>
 	<xsl:import href="common.xsl"/>
@@ -35,7 +35,7 @@ under the License.
 	<xsl:param name="highlight.source">1</xsl:param>

 	<!-- Activate Graphics -->
-	<xsl:param name="callout.graphics" select="1" />
+	<xsl:param name="callout.graphics" select="1"/>
 	<xsl:param name="callout.defaultcolumn">120</xsl:param>
 	<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
 	<xsl:param name="callout.graphics.extension">.png</xsl:param>
@@ -68,35 +68,51 @@ under the License.

 	<!-- Syntax Highlighting -->
 	<xsl:template match='xslthl:keyword' mode="xslthl">
-		<span class="hl-keyword"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-keyword">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:comment' mode="xslthl">
-		<span class="hl-comment"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-comment">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:oneline-comment' mode="xslthl">
-		<span class="hl-comment"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-comment">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:multiline-comment' mode="xslthl">
-		<span class="hl-multiline-comment"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-multiline-comment">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:tag' mode="xslthl">
-		<span class="hl-tag"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-tag">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:attribute' mode="xslthl">
-		<span class="hl-attribute"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-attribute">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:value' mode="xslthl">
-		<span class="hl-value"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-value">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<xsl:template match='xslthl:string' mode="xslthl">
-		<span class="hl-string"><xsl:apply-templates mode="xslthl"/></span>
+		<span class="hl-string">
+			<xsl:apply-templates mode="xslthl"/>
+		</span>
 	</xsl:template>

 	<!-- Custom Title Page -->
@@ -9,7 +9,7 @@ to you 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

-http://www.apache.org/licenses/LICENSE-2.0
+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
@@ -69,32 +69,39 @@ under the License.
 						<fo:table-cell text-align="center">
 							<fo:block>
 								<fo:external-graphic src="images/logo.png" width="240px"
-									height="auto" content-width="scale-to-fit"
-									content-height="scale-to-fit"
-									content-type="content-type:image/png" text-align="center"
+													 height="auto"
+													 content-width="scale-to-fit"
+													 content-height="scale-to-fit"
+													 content-type="content-type:image/png"
+													 text-align="center"
 								/>
 							</fo:block>
-							<fo:block font-family="Helvetica" font-size="20pt" font-weight="bold" padding="10mm">
+							<fo:block font-family="Helvetica" font-size="20pt"
+									  font-weight="bold" padding="10mm">
 								<xsl:value-of select="d:info/d:title"/>
 							</fo:block>
-							<fo:block font-family="Helvetica" font-size="14pt" padding-before="2mm">
+							<fo:block font-family="Helvetica" font-size="14pt"
+									  padding-before="2mm">
 								<xsl:value-of select="d:info/d:subtitle"/>
 							</fo:block>
-							<fo:block font-family="Helvetica" font-size="14pt" padding="2mm">
+							<fo:block font-family="Helvetica" font-size="14pt"
+									  padding="2mm">
 								<xsl:value-of select="d:info/d:releaseinfo"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 					<fo:table-row>
 						<fo:table-cell text-align="center">
-							<fo:block font-family="Helvetica" font-size="14pt" padding="5mm">
+							<fo:block font-family="Helvetica" font-size="14pt"
+									  padding="5mm">
 								<xsl:value-of select="d:info/d:pubdate"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 					<fo:table-row>
 						<fo:table-cell text-align="center">
-							<fo:block font-family="Helvetica" font-size="10pt" padding="10mm">
+							<fo:block font-family="Helvetica" font-size="10pt"
+									  padding="10mm">
 								<xsl:for-each select="d:info/d:authorgroup/d:author">
 									<xsl:if test="position() > 1">
 										<xsl:text>, </xsl:text>
@@ -103,15 +110,19 @@ under the License.
 								</xsl:for-each>
 							</fo:block>

-							<fo:block font-family="Helvetica" font-size="10pt" padding="5mm">
+							<fo:block font-family="Helvetica" font-size="10pt"
+									  padding="5mm">
 								<xsl:value-of select="d:info/d:pubdate"/>
 							</fo:block>

-							<fo:block font-family="Helvetica" font-size="10pt" padding="5mm" padding-before="25em">
-								<xsl:text>Copyright &#xA9; </xsl:text><xsl:value-of select="d:info/d:copyright"/>
+							<fo:block font-family="Helvetica" font-size="10pt"
+									  padding="5mm" padding-before="25em">
+								<xsl:text>Copyright &#xA9; </xsl:text><xsl:value-of
+									select="d:info/d:copyright"/>
 							</fo:block>

-							<fo:block font-family="Helvetica" font-size="8pt" padding="1mm">
+							<fo:block font-family="Helvetica" font-size="8pt"
+									  padding="1mm">
 								<xsl:value-of select="d:info/d:legalnotice"/>
 							</fo:block>
 						</fo:table-cell>
@@ -236,11 +247,13 @@ under the License.
 			<xsl:when test="$pageclass='titlepage'">
 			</xsl:when>

-			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='left'">
+			<xsl:when
+					test="$double.sided != 0 and $sequence = 'even' and $position='left'">
 				<fo:page-number/>
 			</xsl:when>

-			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
+			<xsl:when
+					test="$double.sided != 0 and $sequence = 'odd' and $position='right'">
 				<fo:page-number/>
 			</xsl:when>

@@ -248,11 +261,13 @@ under the License.
 				<fo:page-number/>
 			</xsl:when>

-			<xsl:when test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
+			<xsl:when
+					test="$double.sided != 0 and $sequence = 'odd' and $position='left'">
 				<xsl:value-of select="$Version"/>
 			</xsl:when>

-			<xsl:when test="$double.sided != 0 and $sequence = 'even' and $position='right'">
+			<xsl:when
+					test="$double.sided != 0 and $sequence = 'even' and $position='right'">
 				<xsl:value-of select="$Version"/>
 			</xsl:when>

@@ -308,9 +323,9 @@ under the License.
 	Let's remove it, so this sucker can use our attribute-set only... -->
 	<xsl:template match="d:title" mode="chapter.titlepage.recto.auto.mode">
 		<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-				xsl:use-attribute-sets="chapter.titlepage.recto.style">
+				  xsl:use-attribute-sets="chapter.titlepage.recto.style">
 			<xsl:call-template name="component.title">
-			<xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/>
+				<xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/>
 			</xsl:call-template>
 		</fo:block>
 	</xsl:template>
@@ -455,7 +470,8 @@ under the License.

 	<!-- TITLE INFORMATION FOR FIGURES, EXAMPLES ETC. -->

-	<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
+	<xsl:attribute-set name="formal.title.properties"
+					   use-attribute-sets="normal.para.spacing">
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 		<xsl:attribute name="font-style">italic</xsl:attribute>
 		<xsl:attribute name="font-size">
@@ -524,7 +540,7 @@ under the License.
 		<xsl:attribute name="space-after.maximum">1.5em</xsl:attribute>
 	</xsl:attribute-set>

-    <xsl:attribute-set name="admonition.title.properties">
+	<xsl:attribute-set name="admonition.title.properties">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="hyphenate">false</xsl:attribute>
@@ -545,38 +561,51 @@ under the License.

 	<xsl:template match="processing-instruction('asciidoc-hr')">
 		<fo:block space-after="1em">
-			<fo:leader leader-pattern="rule" rule-thickness="0.5pt" rule-style="solid" leader-length.minimum="100%"/>
+			<fo:leader leader-pattern="rule" rule-thickness="0.5pt" rule-style="solid"
+					   leader-length.minimum="100%"/>
 		</fo:block>
 	</xsl:template>

-  <xsl:template match="processing-instruction('asciidoc-pagebreak')">
-    <fo:block break-after='page'/>
-  </xsl:template>
+	<xsl:template match="processing-instruction('asciidoc-pagebreak')">
+		<fo:block break-after='page'/>
+	</xsl:template>

 	<!-- SYNTAX HIGHLIGHT -->

 	<xsl:template match='xslthl:keyword' mode="xslthl">
-	  <fo:inline font-weight="bold" color="#7F0055"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-weight="bold" color="#7F0055">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 	<xsl:template match='xslthl:string' mode="xslthl">
-	  <fo:inline font-weight="bold" font-style="italic" color="#2A00FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-weight="bold" font-style="italic" color="#2A00FF">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 	<xsl:template match='xslthl:comment' mode="xslthl">
-	  <fo:inline font-style="italic" color="#3F5FBF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-style="italic" color="#3F5FBF">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 	<xsl:template match='xslthl:tag' mode="xslthl">
-	  <fo:inline font-weight="bold" color="#3F7F7F"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-weight="bold" color="#3F7F7F">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 	<xsl:template match='xslthl:attribute' mode="xslthl">
-	  <fo:inline font-weight="bold" color="#7F007F"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-weight="bold" color="#7F007F">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 	<xsl:template match='xslthl:value' mode="xslthl">
-	  <fo:inline font-weight="bold" color="#2A00FF"><xsl:apply-templates mode="xslthl"/></fo:inline>
+		<fo:inline font-weight="bold" color="#2A00FF">
+			<xsl:apply-templates mode="xslthl"/>
+		</fo:inline>
 	</xsl:template>

 </xsl:stylesheet>
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xslthl-config>
-	<highlighter id="java" file="./xslthl/java-hl.xml" />
-	<highlighter id="groovy" file="./xslthl/java-hl.xml" />
-	<highlighter id="html" file="./xslthl/html-hl.xml" />
-	<highlighter id="ini" file="./xslthl/ini-hl.xml" />
-	<highlighter id="php" file="./xslthl/php-hl.xml" />
-	<highlighter id="c" file="./xslthl/c-hl.xml" />
-	<highlighter id="cpp" file="./xslthl/cpp-hl.xml" />
-	<highlighter id="csharp" file="./xslthl/csharp-hl.xml" />
-	<highlighter id="python" file="./xslthl/python-hl.xml" />
-	<highlighter id="ruby" file="./xslthl/ruby-hl.xml" />
-	<highlighter id="perl" file="./xslthl/perl-hl.xml" />
-	<highlighter id="javascript" file="./xslthl/javascript-hl.xml" />
-	<highlighter id="bash" file="./xslthl/bourne-hl.xml" />
-	<highlighter id="css" file="./xslthl/css-hl.xml" />
-	<highlighter id="sql" file="./xslthl/sql2003-hl.xml" />
-	<highlighter id="asciidoc" file="./xslthl/asciidoc-hl.xml" />
-	<highlighter id="properties" file="./xslthl/properties-hl.xml" />
-	<highlighter id="json" file="./xslthl/json-hl.xml" />
-	<highlighter id="yaml" file="./xslthl/yaml-hl.xml" />
-	<namespace prefix="xslthl" uri="http://xslthl.sf.net" />
+	<highlighter id="java" file="./xslthl/java-hl.xml"/>
+	<highlighter id="groovy" file="./xslthl/java-hl.xml"/>
+	<highlighter id="html" file="./xslthl/html-hl.xml"/>
+	<highlighter id="ini" file="./xslthl/ini-hl.xml"/>
+	<highlighter id="php" file="./xslthl/php-hl.xml"/>
+	<highlighter id="c" file="./xslthl/c-hl.xml"/>
+	<highlighter id="cpp" file="./xslthl/cpp-hl.xml"/>
+	<highlighter id="csharp" file="./xslthl/csharp-hl.xml"/>
+	<highlighter id="python" file="./xslthl/python-hl.xml"/>
+	<highlighter id="ruby" file="./xslthl/ruby-hl.xml"/>
+	<highlighter id="perl" file="./xslthl/perl-hl.xml"/>
+	<highlighter id="javascript" file="./xslthl/javascript-hl.xml"/>
+	<highlighter id="bash" file="./xslthl/bourne-hl.xml"/>
+	<highlighter id="css" file="./xslthl/css-hl.xml"/>
+	<highlighter id="sql" file="./xslthl/sql2003-hl.xml"/>
+	<highlighter id="asciidoc" file="./xslthl/asciidoc-hl.xml"/>
+	<highlighter id="properties" file="./xslthl/properties-hl.xml"/>
+	<highlighter id="json" file="./xslthl/json-hl.xml"/>
+	<highlighter id="yaml" file="./xslthl/yaml-hl.xml"/>
+	<namespace prefix="xslthl" uri="http://xslthl.sf.net"/>
 </xslthl-config>
@@ -5,37 +5,37 @@ Syntax highlighting definition for AsciiDoc files

 -->
 <highlighters>
-  <highlighter type="multiline-comment">
-    <start>////</start>
-    <end>////</end>
-  </highlighter>
-  <highlighter type="oneline-comment">
-    <start>//</start>
-    <solitary/>
-  </highlighter>
-  <highlighter type="regex">
-    <pattern>^(={1,6} .+)$</pattern>
-    <style>heading</style>
-    <flags>MULTILINE</flags>
-  </highlighter>
-  <highlighter type="regex">
-    <pattern>^(\.[^\.\s].+)$</pattern>
-    <style>title</style>
-    <flags>MULTILINE</flags>
-  </highlighter>
-  <highlighter type="regex">
-    <pattern>^(:!?\w.*?:)</pattern>
-    <style>attribute</style>
-    <flags>MULTILINE</flags>
-  </highlighter>
-  <highlighter type="regex">
-    <pattern>^(-|\*{1,5}|\d*\.{1,5})(?= .+$)</pattern>
-    <style>bullet</style>
-    <flags>MULTILINE</flags>
-  </highlighter>
-  <highlighter type="regex">
-    <pattern>^(\[.+\])$</pattern>
-    <style>attribute</style>
-    <flags>MULTILINE</flags>
-  </highlighter>
+	<highlighter type="multiline-comment">
+		<start>////</start>
+		<end>////</end>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start>//</start>
+		<solitary/>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(={1,6} .+)$</pattern>
+		<style>heading</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(\.[^\.\s].+)$</pattern>
+		<style>title</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(:!?\w.*?:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(-|\*{1,5}|\d*\.{1,5})(?= .+$)</pattern>
+		<style>bullet</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(\[.+\])$</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
 </highlighters>
@@ -31,8 +31,8 @@ freely, subject to the following restrictions:
 		<quote>'</quote>
 		<quote>"</quote>
 		<flag>-</flag>
-		<noWhiteSpace />
-		<looseTerminator />
+		<noWhiteSpace/>
+		<looseTerminator/>
 	</highlighter>
 	<highlighter type="string">
 		<string>"</string>
@@ -41,16 +41,16 @@ freely, subject to the following restrictions:
 	<highlighter type="string">
 		<string>'</string>
 		<escape>\</escape>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
-		<ignoreCase />
+		<pointStarts/>
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<!-- reserved words -->
@@ -46,7 +46,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<start>#</start>
 		<lineBreakEscape>\</lineBreakEscape>
 		<style>directive</style>
-		<solitary />
+		<solitary/>
 	</highlighter>
 	<highlighter type="string">
 		<string>"</string>
@@ -62,18 +62,18 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<suffix>lu</suffix>
 		<suffix>u</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
+		<pointStarts/>
 		<exponent>e</exponent>
 		<suffix>ul</suffix>
 		<suffix>lu</suffix>
 		<suffix>u</suffix>
 		<suffix>f</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>auto</keyword>
@@ -64,18 +64,18 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<suffix>lu</suffix>
 		<suffix>u</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
+		<pointStarts/>
 		<exponent>e</exponent>
 		<suffix>ul</suffix>
 		<suffix>lu</suffix>
 		<suffix>u</suffix>
 		<suffix>f</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<!-- C keywords -->
@@ -62,7 +62,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<string>@"</string>
 		<endString>"</endString>
 		<escape>\</escape>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="string">
 		<string>"</string>
@@ -78,11 +78,11 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<suffix>lu</suffix>
 		<suffix>u</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
+		<pointStarts/>
 		<exponent>e</exponent>
 		<suffix>ul</suffix>
 		<suffix>lu</suffix>
@@ -91,7 +91,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<suffix>d</suffix>
 		<suffix>m</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>abstract</keyword>
@@ -30,147 +30,147 @@ Reference: http://www.w3.org/TR/CSS21/propidx.html

 -->
 <highlighters>
-    <highlighter type="multiline-comment">
-        <start>/*</start>
-        <end>*/</end>
-    </highlighter>
-    <highlighter type="string">
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="string">
 		<string>"</string>
-        <escape>\</escape>
-        <spanNewLines/>
-    </highlighter>
-    <highlighter type="string">
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="string">
 		<string>'</string>
 		<escape>\</escape>
-        <spanNewLines/>
-    </highlighter>
-    <highlighter type="number">
-        <point>.</point>
-        <pointStarts />
-    </highlighter>
-    <highlighter type="word">
-    	<word>@charset</word>
-    	<word>@import</word>
-    	<word>@media</word>
-    	<word>@page</word>
-    	<style>directive</style>
-    </highlighter>
-    <highlighter type="keywords">
-        <partChars>-</partChars>
-        <keyword>azimuth</keyword>
-        <keyword>background-attachment</keyword>
-        <keyword>background-color</keyword>
-        <keyword>background-image</keyword>
-        <keyword>background-position</keyword>
-        <keyword>background-repeat</keyword>
-        <keyword>background</keyword>
-        <keyword>border-collapse</keyword>
-        <keyword>border-color</keyword>
-        <keyword>border-spacing</keyword>
-        <keyword>border-style</keyword>
-        <keyword>border-top</keyword>
-        <keyword>border-right</keyword>
-        <keyword>border-bottom</keyword>
-        <keyword>border-left</keyword>
-        <keyword>border-top-color</keyword>
-        <keyword>border-right-color</keyword>
-        <keyword>border-bottom-color</keyword>
-        <keyword>border-left-color</keyword>
-        <keyword>border-top-style</keyword>
-        <keyword>border-right-style</keyword>
-        <keyword>border-bottom-style</keyword>
-        <keyword>border-left-style</keyword>
-        <keyword>border-top-width</keyword>
-        <keyword>border-right-width</keyword>
-        <keyword>border-bottom-width</keyword>
-        <keyword>border-left-width</keyword>
-        <keyword>border-width</keyword>
-        <keyword>border</keyword>
-        <keyword>bottom</keyword>
-        <keyword>caption-side</keyword>
-        <keyword>clear</keyword>
-        <keyword>clip</keyword>
-        <keyword>color</keyword>
-        <keyword>content</keyword>
-        <keyword>counter-increment</keyword>
-        <keyword>counter-reset</keyword>
-        <keyword>cue-after</keyword>
-        <keyword>cue-before</keyword>
-        <keyword>cue</keyword>
-        <keyword>cursor</keyword>
-        <keyword>direction</keyword>
-        <keyword>display</keyword>
-        <keyword>elevation</keyword>
-        <keyword>empty-cells</keyword>
-        <keyword>float</keyword>
-        <keyword>font-family</keyword>
-        <keyword>font-size</keyword>
-        <keyword>font-style</keyword>
-        <keyword>font-variant</keyword>
-        <keyword>font-weight</keyword>
-        <keyword>font</keyword>
-        <keyword>height</keyword>
-        <keyword>left</keyword>
-        <keyword>letter-spacing</keyword>
-        <keyword>line-height</keyword>
-        <keyword>list-style-image</keyword>
-        <keyword>list-style-position</keyword>
-        <keyword>list-style-type</keyword>
-        <keyword>list-style</keyword>
-        <keyword>margin-right</keyword>
-        <keyword>margin-left</keyword>
-        <keyword>margin-top</keyword>
-        <keyword>margin-bottom</keyword>
-        <keyword>margin</keyword>
-        <keyword>max-height</keyword>
-        <keyword>max-width</keyword>
-        <keyword>min-height</keyword>
-        <keyword>min-width</keyword>
-        <keyword>orphans</keyword>
-        <keyword>outline-color</keyword>
-        <keyword>outline-style</keyword>
-        <keyword>outline-width</keyword>
-        <keyword>outline</keyword>
-        <keyword>overflow</keyword>
-        <keyword>padding-top</keyword>
-        <keyword>padding-right</keyword>
-        <keyword>padding-bottom</keyword>
-        <keyword>padding-left</keyword>
-        <keyword>padding</keyword>
-        <keyword>page-break-after</keyword>
-        <keyword>page-break-before</keyword>
-        <keyword>page-break-inside</keyword>
-        <keyword>pause-after</keyword>
-        <keyword>pause-before</keyword>
-        <keyword>pause</keyword>
-        <keyword>pitch-range</keyword>
-        <keyword>pitch</keyword>
-        <keyword>play-during</keyword>
-        <keyword>position</keyword>
-        <keyword>quotes</keyword>
-        <keyword>richness</keyword>
-        <keyword>right</keyword>
-        <keyword>speak-header</keyword>
-        <keyword>speak-numeral</keyword>
-        <keyword>speak-punctuation</keyword>
-        <keyword>speak</keyword>
-        <keyword>speech-rate</keyword>
-        <keyword>stress</keyword>
-        <keyword>table-layout</keyword>
-        <keyword>text-align</keyword>
-        <keyword>text-decoration</keyword>
-        <keyword>text-indent</keyword>
-        <keyword>text-transform</keyword>
-        <keyword>top</keyword>
-        <keyword>unicode-bidi</keyword>
-        <keyword>vertical-align</keyword>
-        <keyword>visibility</keyword>
-        <keyword>voice-family</keyword>
-        <keyword>volume</keyword>
-        <keyword>white-space</keyword>
-        <keyword>widows</keyword>
-        <keyword>width</keyword>
-        <keyword>word-spacing</keyword>
-        <keyword>z-index</keyword>
-    </highlighter>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+	</highlighter>
+	<highlighter type="word">
+		<word>@charset</word>
+		<word>@import</word>
+		<word>@media</word>
+		<word>@page</word>
+		<style>directive</style>
+	</highlighter>
+	<highlighter type="keywords">
+		<partChars>-</partChars>
+		<keyword>azimuth</keyword>
+		<keyword>background-attachment</keyword>
+		<keyword>background-color</keyword>
+		<keyword>background-image</keyword>
+		<keyword>background-position</keyword>
+		<keyword>background-repeat</keyword>
+		<keyword>background</keyword>
+		<keyword>border-collapse</keyword>
+		<keyword>border-color</keyword>
+		<keyword>border-spacing</keyword>
+		<keyword>border-style</keyword>
+		<keyword>border-top</keyword>
+		<keyword>border-right</keyword>
+		<keyword>border-bottom</keyword>
+		<keyword>border-left</keyword>
+		<keyword>border-top-color</keyword>
+		<keyword>border-right-color</keyword>
+		<keyword>border-bottom-color</keyword>
+		<keyword>border-left-color</keyword>
+		<keyword>border-top-style</keyword>
+		<keyword>border-right-style</keyword>
+		<keyword>border-bottom-style</keyword>
+		<keyword>border-left-style</keyword>
+		<keyword>border-top-width</keyword>
+		<keyword>border-right-width</keyword>
+		<keyword>border-bottom-width</keyword>
+		<keyword>border-left-width</keyword>
+		<keyword>border-width</keyword>
+		<keyword>border</keyword>
+		<keyword>bottom</keyword>
+		<keyword>caption-side</keyword>
+		<keyword>clear</keyword>
+		<keyword>clip</keyword>
+		<keyword>color</keyword>
+		<keyword>content</keyword>
+		<keyword>counter-increment</keyword>
+		<keyword>counter-reset</keyword>
+		<keyword>cue-after</keyword>
+		<keyword>cue-before</keyword>
+		<keyword>cue</keyword>
+		<keyword>cursor</keyword>
+		<keyword>direction</keyword>
+		<keyword>display</keyword>
+		<keyword>elevation</keyword>
+		<keyword>empty-cells</keyword>
+		<keyword>float</keyword>
+		<keyword>font-family</keyword>
+		<keyword>font-size</keyword>
+		<keyword>font-style</keyword>
+		<keyword>font-variant</keyword>
+		<keyword>font-weight</keyword>
+		<keyword>font</keyword>
+		<keyword>height</keyword>
+		<keyword>left</keyword>
+		<keyword>letter-spacing</keyword>
+		<keyword>line-height</keyword>
+		<keyword>list-style-image</keyword>
+		<keyword>list-style-position</keyword>
+		<keyword>list-style-type</keyword>
+		<keyword>list-style</keyword>
+		<keyword>margin-right</keyword>
+		<keyword>margin-left</keyword>
+		<keyword>margin-top</keyword>
+		<keyword>margin-bottom</keyword>
+		<keyword>margin</keyword>
+		<keyword>max-height</keyword>
+		<keyword>max-width</keyword>
+		<keyword>min-height</keyword>
+		<keyword>min-width</keyword>
+		<keyword>orphans</keyword>
+		<keyword>outline-color</keyword>
+		<keyword>outline-style</keyword>
+		<keyword>outline-width</keyword>
+		<keyword>outline</keyword>
+		<keyword>overflow</keyword>
+		<keyword>padding-top</keyword>
+		<keyword>padding-right</keyword>
+		<keyword>padding-bottom</keyword>
+		<keyword>padding-left</keyword>
+		<keyword>padding</keyword>
+		<keyword>page-break-after</keyword>
+		<keyword>page-break-before</keyword>
+		<keyword>page-break-inside</keyword>
+		<keyword>pause-after</keyword>
+		<keyword>pause-before</keyword>
+		<keyword>pause</keyword>
+		<keyword>pitch-range</keyword>
+		<keyword>pitch</keyword>
+		<keyword>play-during</keyword>
+		<keyword>position</keyword>
+		<keyword>quotes</keyword>
+		<keyword>richness</keyword>
+		<keyword>right</keyword>
+		<keyword>speak-header</keyword>
+		<keyword>speak-numeral</keyword>
+		<keyword>speak-punctuation</keyword>
+		<keyword>speak</keyword>
+		<keyword>speech-rate</keyword>
+		<keyword>stress</keyword>
+		<keyword>table-layout</keyword>
+		<keyword>text-align</keyword>
+		<keyword>text-decoration</keyword>
+		<keyword>text-indent</keyword>
+		<keyword>text-transform</keyword>
+		<keyword>top</keyword>
+		<keyword>unicode-bidi</keyword>
+		<keyword>vertical-align</keyword>
+		<keyword>visibility</keyword>
+		<keyword>voice-family</keyword>
+		<keyword>volume</keyword>
+		<keyword>white-space</keyword>
+		<keyword>widows</keyword>
+		<keyword>width</keyword>
+		<keyword>word-spacing</keyword>
+		<keyword>z-index</keyword>
+	</highlighter>
 </highlighters>
@@ -10,113 +10,113 @@
  This file has been customized for the Asciidoctor project (http://asciidoctor.org).
 -->
 <highlighters>
-  <highlighter type="xml">
-    <elementSet>
-      <style>htmltag</style>
-      <element>a</element>
-      <element>abbr</element>
-      <element>address</element>
-      <element>area</element>
-      <element>article</element>
-      <element>aside</element>
-      <element>audio</element>
-      <element>b</element>
-      <element>base</element>
-      <element>bdi</element>
-      <element>blockquote</element>
-      <element>body</element>
-      <element>br</element>
-      <element>button</element>
-      <element>caption</element>
-      <element>canvas</element>
-      <element>cite</element>
-      <element>code</element>
-      <element>command</element>
-      <element>col</element>
-      <element>colgroup</element>
-      <element>dd</element>
-      <element>del</element>
-      <element>dialog</element>
-      <element>div</element>
-      <element>dl</element>
-      <element>dt</element>
-      <element>em</element>
-      <element>embed</element>
-      <element>fieldset</element>
-      <element>figcaption</element>
-      <element>figure</element>
-      <element>font</element>
-      <element>form</element>
-      <element>footer</element>
-      <element>h1</element>
-      <element>h2</element>
-      <element>h3</element>
-      <element>h4</element>
-      <element>h5</element>
-      <element>h6</element>
-      <element>head</element>
-      <element>header</element>
-      <element>hr</element>
-      <element>html</element>
-      <element>i</element>
-      <element>iframe</element>
-      <element>img</element>
-      <element>input</element>
-      <element>ins</element>
-      <element>kbd</element>
-      <element>label</element>
-      <element>legend</element>
-      <element>li</element>
-      <element>link</element>
-      <element>map</element>
-      <element>mark</element>
-      <element>menu</element>
-      <element>menu</element>
-      <element>meta</element>
-      <element>nav</element>
-      <element>noscript</element>
-      <element>object</element>
-      <element>ol</element>
-      <element>optgroup</element>
-      <element>option</element>
-      <element>p</element>
-      <element>param</element>
-      <element>pre</element>
-      <element>q</element>
-      <element>samp</element>
-      <element>script</element>
-      <element>section</element>
-      <element>select</element>
-      <element>small</element>
-      <element>source</element>
-      <element>span</element>
-      <element>strong</element>
-      <element>style</element>
-      <element>sub</element>
-      <element>summary</element>
-      <element>sup</element>
-      <element>table</element>
-      <element>tbody</element>
-      <element>td</element>
-      <element>textarea</element>
-      <element>tfoot</element>
-      <element>th</element>
-      <element>thead</element>
-      <element>time</element>
-      <element>title</element>
-      <element>tr</element>
-      <element>track</element>
-      <element>u</element>
-      <element>ul</element>
-      <element>var</element>
-      <element>video</element>
-      <element>wbr</element>
-      <element>xmp</element>
-      <ignoreCase/>
-    </elementSet>
-    <elementPrefix>
-      <style>namespace</style>
-      <prefix>xsl:</prefix>
-    </elementPrefix>
-  </highlighter>
+	<highlighter type="xml">
+		<elementSet>
+			<style>htmltag</style>
+			<element>a</element>
+			<element>abbr</element>
+			<element>address</element>
+			<element>area</element>
+			<element>article</element>
+			<element>aside</element>
+			<element>audio</element>
+			<element>b</element>
+			<element>base</element>
+			<element>bdi</element>
+			<element>blockquote</element>
+			<element>body</element>
+			<element>br</element>
+			<element>button</element>
+			<element>caption</element>
+			<element>canvas</element>
+			<element>cite</element>
+			<element>code</element>
+			<element>command</element>
+			<element>col</element>
+			<element>colgroup</element>
+			<element>dd</element>
+			<element>del</element>
+			<element>dialog</element>
+			<element>div</element>
+			<element>dl</element>
+			<element>dt</element>
+			<element>em</element>
+			<element>embed</element>
+			<element>fieldset</element>
+			<element>figcaption</element>
+			<element>figure</element>
+			<element>font</element>
+			<element>form</element>
+			<element>footer</element>
+			<element>h1</element>
+			<element>h2</element>
+			<element>h3</element>
+			<element>h4</element>
+			<element>h5</element>
+			<element>h6</element>
+			<element>head</element>
+			<element>header</element>
+			<element>hr</element>
+			<element>html</element>
+			<element>i</element>
+			<element>iframe</element>
+			<element>img</element>
+			<element>input</element>
+			<element>ins</element>
+			<element>kbd</element>
+			<element>label</element>
+			<element>legend</element>
+			<element>li</element>
+			<element>link</element>
+			<element>map</element>
+			<element>mark</element>
+			<element>menu</element>
+			<element>menu</element>
+			<element>meta</element>
+			<element>nav</element>
+			<element>noscript</element>
+			<element>object</element>
+			<element>ol</element>
+			<element>optgroup</element>
+			<element>option</element>
+			<element>p</element>
+			<element>param</element>
+			<element>pre</element>
+			<element>q</element>
+			<element>samp</element>
+			<element>script</element>
+			<element>section</element>
+			<element>select</element>
+			<element>small</element>
+			<element>source</element>
+			<element>span</element>
+			<element>strong</element>
+			<element>style</element>
+			<element>sub</element>
+			<element>summary</element>
+			<element>sup</element>
+			<element>table</element>
+			<element>tbody</element>
+			<element>td</element>
+			<element>textarea</element>
+			<element>tfoot</element>
+			<element>th</element>
+			<element>thead</element>
+			<element>time</element>
+			<element>title</element>
+			<element>tr</element>
+			<element>track</element>
+			<element>u</element>
+			<element>ul</element>
+			<element>var</element>
+			<element>video</element>
+			<element>wbr</element>
+			<element>xmp</element>
+			<ignoreCase/>
+		</elementSet>
+		<elementPrefix>
+			<style>namespace</style>
+			<prefix>xsl:</prefix>
+		</elementPrefix>
+	</highlighter>
 </highlighters>
@@ -54,7 +54,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
@@ -62,7 +62,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<suffix>f</suffix>
 		<suffix>d</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>abstract</keyword>
@@ -44,12 +44,12 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
 		<exponent>e</exponent>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>break</keyword>
@@ -20,7 +20,7 @@
 		<suffix>f</suffix>
 		<suffix>d</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>true</keyword>
@@ -47,12 +47,12 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
-		<ignoreCase />
+		<pointStarts/>
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>if</keyword>
@@ -47,24 +47,24 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	<highlighter type="string">
 		<string>"</string>
 		<escape>\</escape>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="string">
 		<string>'</string>
 		<escape>\</escape>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="heredoc">
 		<start>&lt;&lt;&lt;</start>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
 		<exponent>e</exponent>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>and</keyword>
@@ -142,7 +142,7 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 		<keyword>__NAMESPACE__</keyword>
 		<keyword>goto</keyword>
 		<keyword>__DIR__</keyword>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="word">
 		<!-- highlight the php open and close tags as directives -->
@@ -38,11 +38,11 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	<highlighter type="oneline-comment">#</highlighter>
 	<highlighter type="string">
 		<string>"""</string>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="string">
 		<string>'''</string>
-		<spanNewLines />
+		<spanNewLines/>
 	</highlighter>
 	<highlighter type="string">
 		<string>"</string>
@@ -55,14 +55,14 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
+		<pointStarts/>
 		<exponent>e</exponent>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>and</keyword>
@@ -59,12 +59,12 @@ Michiel Hendriks <elmuerte at users.sourceforge.net>
 	</highlighter>
 	<highlighter type="hexnumber">
 		<prefix>0x</prefix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
 		<exponent>e</exponent>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>alias</keyword>
@@ -32,36 +32,36 @@ freely, subject to the following restrictions:
 	</highlighter>
 	<highlighter type="string">
 		<string>'</string>
-		<doubleEscapes />
+		<doubleEscapes/>
 	</highlighter>
 	<highlighter type="string">
 		<string>U'</string>
 		<endString>'</endString>
-		<doubleEscapes />
+		<doubleEscapes/>
 	</highlighter>
 	<highlighter type="string">
 		<string>B'</string>
 		<endString>'</endString>
-		<doubleEscapes />
+		<doubleEscapes/>
 	</highlighter>
 	<highlighter type="string">
 		<string>N'</string>
 		<endString>'</endString>
-		<doubleEscapes />
+		<doubleEscapes/>
 	</highlighter>
 	<highlighter type="string">
 		<string>X'</string>
 		<endString>'</endString>
-		<doubleEscapes />
+		<doubleEscapes/>
 	</highlighter>
 	<highlighter type="number">
 		<point>.</point>
-		<pointStarts />
+		<pointStarts/>
 		<exponent>e</exponent>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
-		<ignoreCase />
+		<ignoreCase/>
 		<!-- reserved -->
 		<keyword>A</keyword>
 		<keyword>ABS</keyword>
@@ -20,7 +20,7 @@
 		<suffix>f</suffix>
 		<suffix>d</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>true</keyword>
@@ -24,7 +24,14 @@ attrs = doc.attributes
 attrs['allow-uri-read'] = true
 puts attrs

-out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n"
+out = <<-WARNING
+////
+DO NOT EDIT THIS FILE. IT WAS GENERATED.
+Manual changes to this file will be lost when it is generated again.
+Edit the files in the src/main/asciidoc/ directory instead.
+////
+
+WARNING
 doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs
 out << doc.reader.read

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    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
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -1,13 +1,15 @@
 <?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">
+		 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>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.1.0.RELEASE</version>
+	<version>2.1.4.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
-	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
+	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
+		Cloud projects
+	</description>
 	<modules>
 		<module>docs</module>
 		<module>spring-cloud-build-dependencies</module>
@@ -17,21 +19,23 @@
 	<url>https://spring.io/spring-cloud</url>
 	<properties>
 		<java.version>1.8</java.version>
-		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<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.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.1.1.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>2.1.0.RELEASE</spring-cloud-build.version>
+		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.1.4.RELEASE</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
+		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec
+		</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>

 		<!-- Plugins -->
@@ -39,8 +43,8 @@
 		<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>
+		<puppycrawl-tools-checkstyle.version>8.18</puppycrawl-tools-checkstyle.version>
+		<spring-javaformat.version>0.0.7</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>
@@ -60,9 +64,22 @@
 		<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>
+		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
 		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
 		<disable.checks>false</disable.checks>
+		<maven-checkstyle-plugin.failsOnError>false</maven-checkstyle-plugin.failsOnError>
+		<maven-checkstyle-plugin.failOnViolation>false
+		</maven-checkstyle-plugin.failOnViolation>
+		<maven-checkstyle-plugin.includeTestSourceDirectory>false
+		</maven-checkstyle-plugin.includeTestSourceDirectory>
+		<spring-cloud-build-checkstyle.branch>master
+		</spring-cloud-build-checkstyle.branch>
+		<checkstyle.suppressions.file>
+			https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
+		</checkstyle.suppressions.file>
+		<checkstyle.additional.suppressions.file>
+			${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
+		</checkstyle.additional.suppressions.file>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -84,28 +101,31 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-Copyright 2014-2015 the original author or authors.
+				Copyright 2014-2015 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
+				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

-	http://www.apache.org/licenses/LICENSE-2.0
+				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.
+				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.
+				See the License for the specific language governing permissions and
+				limitations under the License.
 			</comments>
 		</license>
 	</licenses>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-build</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git</developerConnection>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git
+		</connection>
+		<developerConnection>
+			scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+		</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<developers>
@@ -114,7 +134,7 @@ limitations under the License.
 			<name>Dave Syer</name>
 			<email>dsyer at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>lead</role>
 			</roles>
@@ -124,7 +144,7 @@ limitations under the License.
 			<name>Spencer Gibb</name>
 			<email>sgibb at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>lead</role>
 			</roles>
@@ -134,7 +154,7 @@ limitations under the License.
 			<name>Marcin Grzejszczak</name>
 			<email>mgrzejszczak at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>developer</role>
 			</roles>
@@ -144,7 +164,7 @@ limitations under the License.
 			<name>Ryan Baxter</name>
 			<email>rbaxter at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>developer</role>
 			</roles>
@@ -204,6 +224,39 @@ limitations under the License.
 					</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>
@@ -244,7 +297,8 @@ limitations under the License.
 						<archive>
 							<manifest>
 								<mainClass>${start-class}</mainClass>
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+								<addDefaultImplementationEntries>true
+								</addDefaultImplementationEntries>
 							</manifest>
 						</archive>
 					</configuration>
@@ -277,7 +331,8 @@ limitations under the License.
 						<archive>
 							<manifest>
 								<mainClass>${start-class}</mainClass>
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+								<addDefaultImplementationEntries>true
+								</addDefaultImplementationEntries>
 							</manifest>
 						</archive>
 					</configuration>
@@ -301,6 +356,23 @@ limitations under the License.
 						<useDefaultDelimiters>false</useDefaultDelimiters>
 					</configuration>
 				</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>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
@@ -328,14 +400,24 @@ limitations under the License.
 							<phase>validate</phase>
 							<inherited>true</inherited>
 							<configuration>
+								<skip>${disable.checks}</skip>
 								<configLocation>checkstyle.xml</configLocation>
 								<headerLocation>checkstyle-header.txt</headerLocation>
-								<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
+								<propertyExpansion>
+									checkstyle.build.directory=${project.build.directory}
+									checkstyle.suppressions.file=${checkstyle.suppressions.file}
+									checkstyle.additional.suppressions.file=${checkstyle.additional.suppressions.file}
+								</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
 								<!-- TODO: Start fixing the errors -->
-								<includeTestSourceDirectory>false</includeTestSourceDirectory>
-								<failsOnError>false</failsOnError>
-								<failOnViolation>false</failOnViolation>
+								<includeTestSourceDirectory>
+									${maven-checkstyle-plugin.includeTestSourceDirectory}
+								</includeTestSourceDirectory>
+								<failsOnError>${maven-checkstyle-plugin.failsOnError}
+								</failsOnError>
+								<failOnViolation>
+									${maven-checkstyle-plugin.failOnViolation}
+								</failOnViolation>
 							</configuration>
 							<goals>
 								<goal>check</goal>
@@ -343,23 +425,6 @@ limitations under the License.
 						</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>
@@ -375,7 +440,9 @@ limitations under the License.
 						<verbose>true</verbose>
 						<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
 						<generateGitPropertiesFile>true</generateGitPropertiesFile>
-						<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+						<generateGitPropertiesFilename>
+							${project.build.outputDirectory}/git.properties
+						</generateGitPropertiesFilename>
 					</configuration>
 				</plugin>
 				<!-- Support our own plugin -->
@@ -407,7 +474,8 @@ limitations under the License.
 						</dependency>
 					</dependencies>
 					<configuration>
-						<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+						<keepDependenciesWithProvidedScope>true
+						</keepDependenciesWithProvidedScope>
 						<createDependencyReducedPom>true</createDependencyReducedPom>
 						<filters>
 							<filter>
@@ -428,17 +496,22 @@ limitations under the License.
 							</goals>
 							<configuration>
 								<transformers>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<transformer
+											implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 										<resource>META-INF/spring.handlers</resource>
 									</transformer>
-									<transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
+									<transformer
+											implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
 										<resource>META-INF/spring.factories</resource>
 									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+									<transformer
+											implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
 										<resource>META-INF/spring.schemas</resource>
 									</transformer>
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-									<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<transformer
+											implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+									<transformer
+											implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
 										<mainClass>${start-class}</mainClass>
 									</transformer>
 								</transformers>
@@ -503,7 +576,9 @@ limitations under the License.
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}</url>
+			<url>
+				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+			</url>
 		</site>
 		<repository>
 			<id>sonatype-nexus-staging</id>
@@ -594,7 +669,9 @@ limitations under the License.
 				<repository>
 					<id>bintray</id>
 					<name>Jcenter Repository</name>
-					<url>https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}</url>
+					<url>
+						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+					</url>
 				</repository>
 			</distributionManagement>
 		</profile>
@@ -704,13 +781,17 @@ limitations under the License.
 									<configuration>
 										<artifactItems>
 											<artifactItem>
-												<groupId>org.springframework.cloud</groupId>
-												<artifactId>spring-cloud-build-docs</artifactId>
-												<version>${spring-cloud-build.version}</version>
+												<groupId>org.springframework.cloud
+												</groupId>
+												<artifactId>spring-cloud-build-docs
+												</artifactId>
+												<version>${spring-cloud-build.version}
+												</version>
 												<classifier>sources</classifier>
 												<type>jar</type>
 												<overWrite>false</overWrite>
-												<outputDirectory>${docs.resources.dir}</outputDirectory>
+												<outputDirectory>${docs.resources.dir}
+												</outputDirectory>
 											</artifactItem>
 										</artifactItems>
 									</configuration>
@@ -736,13 +817,17 @@ limitations under the License.
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<sourceDocumentName>${docs.main}.adoc</sourceDocumentName>
+										<sourceDocumentName>${docs.main}.adoc
+										</sourceDocumentName>
 										<backend>docbook5</backend>
 										<doctype>book</doctype>
 										<attributes>
 											<docinfo>true</docinfo>
-											<spring-boot-docs-version>${spring-boot.version}</spring-boot-docs-version>
-											<spring-cloud-version>${project.version}</spring-cloud-version>
+											<spring-boot-docs-version>
+												${spring-boot.version}
+											</spring-boot-docs-version>
+											<spring-cloud-version>${project.version}
+											</spring-cloud-version>
 											<allow-uri-read>true</allow-uri-read>
 											<safe-mode>unsafe</safe-mode>
 										</attributes>
@@ -755,16 +840,21 @@ limitations under the License.
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<sourceDocumentName>${docs.main}.adoc</sourceDocumentName>
-										<sourceDirectory>${basedir}/target/generated-index/</sourceDirectory>
+										<sourceDocumentName>${docs.main}.adoc
+										</sourceDocumentName>
+										<sourceDirectory>
+											${basedir}/target/generated-index/
+										</sourceDirectory>
 										<backend>html</backend>
 										<doctype>article</doctype>
 										<attributes>
 											<docinfo>true</docinfo>
-											<spring-cloud-version>${project.version}</spring-cloud-version>
+											<spring-cloud-version>${project.version}
+											</spring-cloud-version>
 											<allow-uri-read>true</allow-uri-read>
 											<safe-mode>unsafe</safe-mode>
-											<source-highlighter>prettify</source-highlighter>
+											<source-highlighter>prettify
+											</source-highlighter>
 											<docs-main>${docs.main}</docs-main>
 										</attributes>
 									</configuration>
@@ -776,14 +866,19 @@ limitations under the License.
 							<artifactId>docbkx-maven-plugin</artifactId>
 							<version>${docbkx-maven-plugin.version}</version>
 							<configuration>
-								<sourceDirectory>${basedir}/target/generated-docs</sourceDirectory>
+								<sourceDirectory>${basedir}/target/generated-docs
+								</sourceDirectory>
 								<includes>${docs.main}.xml</includes>
 								<xincludeSupported>true</xincludeSupported>
 								<chunkedOutput>false</chunkedOutput>
-								<foCustomization>${docs.resources.dir}/docbook/xsl/pdf.xsl</foCustomization>
+								<foCustomization>
+									${docs.resources.dir}/docbook/xsl/pdf.xsl
+								</foCustomization>
 								<useExtensions>1</useExtensions>
 								<highlightSource>1</highlightSource>
-								<highlightXslthlConfig>${docs.resources.dir}/docbook/xsl/xslthl-config.xml</highlightXslthlConfig>
+								<highlightXslthlConfig>
+									${docs.resources.dir}/docbook/xsl/xslthl-config.xml
+								</highlightXslthlConfig>
 							</configuration>
 							<dependencies>
 								<dependency>
@@ -808,20 +903,26 @@ limitations under the License.
 									</goals>
 									<phase>prepare-package</phase>
 									<configuration>
-										<htmlCustomization>${docs.resources.dir}/docbook/xsl/html-singlepage.xsl</htmlCustomization>
-										<targetDirectory>${basedir}/target/docbook/htmlsingle</targetDirectory>
+										<htmlCustomization>
+											${docs.resources.dir}/docbook/xsl/html-singlepage.xsl
+										</htmlCustomization>
+										<targetDirectory>
+											${basedir}/target/docbook/htmlsingle
+										</targetDirectory>
 										<postProcess>
 											<copy todir="${basedir}/target/contents/reference/htmlsingle">
-												<fileset dir="${basedir}/target/docbook/htmlsingle">
-													<include name="**/*.html" />
+												<fileset
+														dir="${basedir}/target/docbook/htmlsingle">
+													<include name="**/*.html"/>
 												</fileset>
 											</copy>
 											<copy todir="${basedir}/target/contents/reference/htmlsingle">
-												<fileset dir="${docs.resources.dir}/docbook">
-													<include name="**/*.css" />
-													<include name="**/*.png" />
-													<include name="**/*.gif" />
-													<include name="**/*.jpg" />
+												<fileset
+														dir="${docs.resources.dir}/docbook">
+													<include name="**/*.css"/>
+													<include name="**/*.png"/>
+													<include name="**/*.gif"/>
+													<include name="**/*.jpg"/>
 												</fileset>
 											</copy>
 										</postProcess>
@@ -834,23 +935,29 @@ limitations under the License.
 									</goals>
 									<phase>prepare-package</phase>
 									<configuration>
-										<htmlCustomization>${docs.resources.dir}/docbook/xsl/html-multipage.xsl</htmlCustomization>
-										<targetDirectory>${basedir}/target/docbook/html</targetDirectory>
+										<htmlCustomization>
+											${docs.resources.dir}/docbook/xsl/html-multipage.xsl
+										</htmlCustomization>
+										<targetDirectory>${basedir}/target/docbook/html
+										</targetDirectory>
 										<!-- By default `-` prefix is added to files and gh-pages don't render these files -->
-										<chunkedFilenamePrefix>multi_</chunkedFilenamePrefix>
+										<chunkedFilenamePrefix>multi_
+										</chunkedFilenamePrefix>
 										<chunkedOutput>true</chunkedOutput>
 										<postProcess>
 											<copy todir="${basedir}/target/contents/reference/html">
-												<fileset dir="${basedir}/target/docbook/html">
-													<include name="**/*.html" />
+												<fileset
+														dir="${basedir}/target/docbook/html">
+													<include name="**/*.html"/>
 												</fileset>
 											</copy>
 											<copy todir="${basedir}/target/contents/reference/html">
-												<fileset dir="${docs.resources.dir}/docbook">
-													<include name="**/*.css" />
-													<include name="**/*.png" />
-													<include name="**/*.gif" />
-													<include name="**/*.jpg" />
+												<fileset
+														dir="${docs.resources.dir}/docbook">
+													<include name="**/*.css"/>
+													<include name="**/*.png"/>
+													<include name="**/*.gif"/>
+													<include name="**/*.jpg"/>
 												</fileset>
 											</copy>
 										</postProcess>
@@ -910,7 +1017,8 @@ limitations under the License.
 									</goals>
 									<configuration>
 										<target>
-											<java classname="org.jruby.Main" failonerror="yes">
+											<java classname="org.jruby.Main"
+												  failonerror="yes">
 												<arg value="${docs.resources.dir}/ruby/generate_readme.sh"/>
 												<arg value="-o"/>
 												<arg value="${main.basedir}/README.adoc"/>
@@ -927,10 +1035,13 @@ limitations under the License.
 									<configuration>
 										<target>
 											<copy todir="${basedir}/target/generated-docs/css">
-												<fileset dir="${docs.resources.dir}/docbook/css"/>
+												<fileset
+														dir="${docs.resources.dir}/docbook/css"/>
 											</copy>
-											<copy failonerror="false" todir="${basedir}/target/generated-docs/images">
-												<fileset dir="${docs.resources.dir}/docbook/images"/>
+											<copy failonerror="false"
+												  todir="${basedir}/target/generated-docs/images">
+												<fileset
+														dir="${docs.resources.dir}/docbook/images"/>
 											</copy>
 										</target>
 									</configuration>
@@ -943,6 +1054,8 @@ limitations under the License.
 									</goals>
 									<configuration>
 										<target>
+											<!-- @formatter:off -->
+											<!-- @checkstyle:off -->
 											<echo file="${basedir}/target/generated-index/${docs.main}.adoc">
 :nofooter:
 :linkcss:
@@ -958,6 +1071,8 @@ limitations under the License.
 - link:single/{docs-main}.html[Single HTML]
 - link:multi/multi_{docs-main}.html[Multi HTML]
 											</echo>
+											<!-- @checkstyle:on -->
+											<!-- @formatter:on -->
 										</target>
 									</configuration>
 								</execution>
@@ -970,10 +1085,12 @@ limitations under the License.
 									<configuration>
 										<target>
 											<copy todir="${basedir}/target/generated-docs/single">
-												<fileset dir="${basedir}/target/contents/reference/htmlsingle"/>
+												<fileset
+														dir="${basedir}/target/contents/reference/htmlsingle"/>
 											</copy>
 											<copy todir="${basedir}/target/generated-docs/multi">
-												<fileset dir="${basedir}/target/contents/reference/html"/>
+												<fileset
+														dir="${basedir}/target/contents/reference/html"/>
 											</copy>
 										</target>
 									</configuration>
@@ -986,12 +1103,16 @@ limitations under the License.
 									</goals>
 									<configuration>
 										<target>
-											<fileset id="unresolved.file" dir="${basedir}/target/contents/reference/" includes="**/*.html">
+											<fileset id="unresolved.file"
+													 dir="${basedir}/target/contents/reference/"
+													 includes="**/*.html">
 												<contains text="Unresolved"/>
 											</fileset>
 											<fail message="[Unresolved] Found...failing">
 												<condition>
-													<resourcecount when="greater" count="0" refid="unresolved.file" />
+													<resourcecount when="greater"
+																   count="0"
+																   refid="unresolved.file"/>
 												</condition>
 											</fail>
 										</target>
@@ -1006,27 +1127,43 @@ limitations under the License.
 									<configuration>
 										<exportAntProperties>true</exportAntProperties>
 										<target>
-											<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
-											<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask"/>
-											<var name="version-type" value="${project.version}"/>
+											<taskdef
+													resource="net/sf/antcontrib/antcontrib.properties"/>
+											<taskdef name="stringutil"
+													 classname="ise.antelope.tasks.StringUtilTask"/>
+											<var name="version-type"
+												 value="${project.version}"/>
 											<propertyregex property="version-type"
-														   override="true" input="${version-type}" regexp=".*\.(.*)"
-														   replace="\1" />
+														   override="true"
+														   input="${version-type}"
+														   regexp=".*\.(.*)"
+														   replace="\1"/>
 											<propertyregex property="version-type"
-														   override="true" input="${version-type}" regexp="(M)\d+"
-														   replace="MILESTONE" />
+														   override="true"
+														   input="${version-type}"
+														   regexp="(M)\d+"
+														   replace="MILESTONE"/>
 											<propertyregex property="version-type"
-														   override="true" input="${version-type}" regexp="(RC)\d+"
-														   replace="MILESTONE" />
+														   override="true"
+														   input="${version-type}"
+														   regexp="(RC)\d+"
+														   replace="MILESTONE"/>
 											<propertyregex property="version-type"
-														   override="true" input="${version-type}" regexp="BUILD-(.*)"
-														   replace="SNAPSHOT" />
-											<stringutil string="${version-type}" property="spring-cloud-repo">
+														   override="true"
+														   input="${version-type}"
+														   regexp="BUILD-(.*)"
+														   replace="SNAPSHOT"/>
+											<stringutil string="${version-type}"
+														property="spring-cloud-repo">
 												<lowercase/>
 											</stringutil>
-											<var name="github-tag" value="v${project.version}"/>
-											<propertyregex property="github-tag" override="true"
-														   input="${github-tag}" regexp=".*SNAPSHOT" replace="master" />
+											<var name="github-tag"
+												 value="v${project.version}"/>
+											<propertyregex property="github-tag"
+														   override="true"
+														   input="${github-tag}"
+														   regexp=".*SNAPSHOT"
+														   replace="master"/>
 										</target>
 									</configuration>
 								</execution>
@@ -1048,9 +1185,11 @@ limitations under the License.
 											<zip.type>docs</zip.type>
 										</deployProperties>
 										<publisher>
-											<contextUrl>https://repo.spring.io</contextUrl>
+											<contextUrl>https://repo.spring.io
+											</contextUrl>
 											<repoKey>libs-release-local</repoKey>
-											<snapshotRepoKey>libs-snapshots-local</snapshotRepoKey>
+											<snapshotRepoKey>libs-snapshots-local
+											</snapshotRepoKey>
 										</publisher>
 									</configuration>
 								</execution>
@@ -1,23 +1,25 @@
 <?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">
+		 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>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.1.0.RELEASE</version>
+	<version>2.1.4.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>
+	<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.1.1.RELEASE</version>
+		<version>2.1.3.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.3.RELEASE</spring-boot.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -38,8 +40,9 @@
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
-		</url>
+			<url>
+				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+			</url>
 		</site>
 		<repository>
 			<id>repo.spring.io</id>
@@ -69,7 +72,9 @@
 				<repository>
 					<id>bintray</id>
 					<name>Jcenter Repository</name>
-					<url>https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}</url>
+					<url>
+						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+					</url>
 				</repository>
 			</distributionManagement>
 		</profile>
@@ -84,7 +89,8 @@
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					</url>
 				</repository>
 			</distributionManagement>
 			<build>
@@ -1,7 +1,7 @@
 <?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">
+		 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>
 	<artifactId>spring-cloud-build-tools</artifactId>
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.RELEASE</version>
+		<version>2.1.4.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -20,5 +20,5 @@
 			<version>${puppycrawl-tools-checkstyle.version}</version>
 		</dependency>
 	</dependencies>
-	
+
 </project>
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files="[\\/]src[\\/]test[\\/](java|groovy)[\\/]"
+			  checks="(Javadoc*|HideUtility*)"/>
+	<suppress files=".*sample.*" checks="(Javadoc*|HideUtility*)"/>
+	<suppress files=".*example.*" checks="(Javadoc*|HideUtility*)"/>
+	<suppress files=".*integration-tests.*" checks="(Javadoc*|HideUtility*)"/>
+	<suppress files="(.*Tests\.java|.*Tests\.groovy)" 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]*"/>
+</suppressions>
@@ -1,7 +1,7 @@

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       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,
@@ -5,7 +5,7 @@
 ^\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 *      https://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$
@@ -5,143 +5,164 @@
 <module name="com.puppycrawl.tools.checkstyle.Checker">

 	<module name="SuppressionFilter">
-		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
+		<property name="file" value="${checkstyle.suppressions.file}"/>
+		<property name="optional" value="true"/>
+	</module>
+
+	<module name="SuppressionFilter">
+		<property name="file" value="${checkstyle.additional.suppressions.file}"/>
 		<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" />
+		<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>

+	<!-- TreeWalker Checks -->
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck" >
+		<property name="tabWidth" value="1"/>
+
+		<!-- Spring Cloud ones -->
+		<!-- <module name="LineLength">
+			<property name="max" value="120"/>
+		</module> -->
+
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
 			<property name="illegalPkgs" value="com.google.common"/>
 		</module>

+		<module name="SuppressionCommentFilter">
+			<property name="offCommentFormat" value="@checkstyle:off"/>
+			<property name="onCommentFormat" value="@checkstyle:on"/>
+		</module>
+
 		<!-- TAKEN FROM SPRING BOOT -->
 		<!-- Annotations -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck">
-			<property name="elementStyle" value="compact" />
+			<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.MissingOverrideCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
 			<property name="allowSamelineSingleParameterlessAnnotation"
-					  value="false" />
+					  value="false"/>
 		</module>

 		<!-- Block Checks -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
-			<property name="option" value="text" />
+			<property name="option" value="text"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck" />
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck">
-			<property name="option" value="alone" />
+			<property name="option" value="alone"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck" />
+		<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.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.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" />
+			<property name="max" value="3"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
-			<property name="max" value="3" />
+			<property name="max" value="3"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck" />
-		<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
+		<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" />
+		</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.AvoidStarImportCheck"/>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">-->
+		<!--<property name="excludes"-->
+		<!--value="io.restassured.RestAssured.*, org.assertj.core.api.Assertions.*, org.assertj.core.api.Assumptions.*, org.awaitility.Awaitility.*, 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.IllegalImportCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.RedundantImportCheck"/>
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck">
-			<property name="processJavadoc" value="true" />
+			<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" />
+			<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="scope" value="public"/>
+			<property name="excludeScope" value="package"/>
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-			<property name="allowMissingJavadoc" value="true" />
+			<property name="scope" value="public"/>
+			<property name="excludeScope" value="package"/>
+			<property name="allowMissingJavadoc" value="true"/>
 		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>
 		</module>
-		<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.JavadocStyleCheck"/>
+		<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"/>
+			<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"/>
+			<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" />
+		<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"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>

 		<!-- Regexp -->
 		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
-			<property name="format" value="^\t* +\t*\S" />
+			<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" />
+					  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"/>
@@ -152,34 +173,29 @@
 		</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="format"
+					  value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert"/>
 			<property name="message"
-					  value="Please use AssertJ imports." />
-			<property name="ignoreComments" value="true" />
+					  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" />
+			<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 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 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"/>
 	</module>
 </module>
@@ -1,6 +1,5 @@
 <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>
+	<profile version="1.0">
+		<option name="myName" value="Project Default"/>
+	</profile>
 </component>
@@ -1,12 +1,12 @@
-<code_scheme name="Spring Boot Java Conventions" version="173">
+<code_scheme name="Spring Boot Java Conventions NEW" 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="USE_FLYING_GEESE_BRACES" value="true" />
    <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">
@@ -48,10 +48,23 @@
    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
  </JavaCodeStyleSettings>
  <codeStyleSettings language="Groovy">
+    <option name="RIGHT_MARGIN" value="120" />
+    <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="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+    <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="PREFER_PARAMETERS_WRAP" value="true" />
+    <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+    <option name="IF_BRACE_FORCE" value="3" />
+    <option name="WHILE_BRACE_FORCE" value="3" />
+    <option name="FOR_BRACE_FORCE" value="3" />
+    <option name="WRAP_ON_TYPING" value="0" />
    <indentOptions>
      <option name="USE_TAB_CHARACTER" value="true" />
      <option name="LABEL_INDENT_SIZE" value="4" />
@@ -1,9 +1,9 @@
 <?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">
+		 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.1.0.RELEASE</version>
+	<version>2.1.4.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -18,28 +18,31 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-Copyright 2014-2015 the original author or authors.
+				Copyright 2014-2015 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
+				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

-	http://www.apache.org/licenses/LICENSE-2.0
+	            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.
+				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.
+				See the License for the specific language governing permissions and
+				limitations under the License.
 			</comments>
 		</license>
 	</licenses>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-build</url>
-		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git</connection>
-		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git</developerConnection>
+		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-build.git
+		</connection>
+		<developerConnection>
+			scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git
+		</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
 	<developers>
@@ -48,7 +51,7 @@ limitations under the License.
 			<name>Dave Syer</name>
 			<email>dsyer at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>Project lead</role>
 			</roles>
@@ -58,7 +61,7 @@ limitations under the License.
 			<name>Spencer Gibb</name>
 			<email>sgibb at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>Project lead</role>
 			</roles>
@@ -71,8 +74,9 @@ limitations under the License.
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
-		</url>
+			<url>
+				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+			</url>
 		</site>
 		<repository>
 			<id>repo.spring.io</id>
@@ -102,7 +106,9 @@ limitations under the License.
 				<repository>
 					<id>bintray</id>
 					<name>Jcenter Repository</name>
-					<url>https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}</url>
+					<url>
+						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
+					</url>
 				</repository>
 			</distributionManagement>
 		</profile>
@@ -117,7 +123,8 @@ limitations under the License.
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					</url>
 				</repository>
 			</distributionManagement>
 			<build>
@@ -187,6 +194,41 @@ limitations under the License.
 		</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	6f6d6aa856	Update SNAPSHOT to 2.1.4.RELEASE	2019-03-25 13:52:46 +00:00
Spring Operator	0b737621f0	URL Cleanup (#106 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://www.apache.org/licenses/ with 2 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * [ ] http://www.apache.org/licenses/LICENSE-2.0 with 8 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).	2019-03-22 10:52:25 +01:00
Marcin Grzejszczak	2a2c9f892e	Updated Spring Java format	2019-03-22 09:22:01 +01:00
Marcin Grzejszczak	83fe233eb0	Updated checkstyle	2019-03-22 09:20:29 +01:00
Marcin Grzejszczak	b9b56dece4	Updated java format version	2019-03-22 09:20:07 +01:00
Ryan Baxter	35d8230662	Updating checkstyle rules to make sure header uses https	2019-03-21 12:08:21 -04:00
Ryan Baxter	a72e84c536	Merge remote-tracking branch 'origin/2.0.x' into 2.1.x	2019-03-21 12:02:04 -04:00
Spring Operator	94e1a06065	URL Cleanup (#94 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://maven.apache.org/xsd/maven-4.0.0.xsd with 5 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch with 1 occurrences migrated to: https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch ([https](https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch) result 200). * http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin with 1 occurrences migrated to: https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin ([https](https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin) result 200). * http://www.apache.org/licenses/LICENSE-2.0 with 4 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). * http://www.spring.io with 6 occurrences migrated to: https://www.spring.io ([https](https://www.spring.io) result 301). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 10 occurrences * http://www.w3.org/2001/XMLSchema-instance with 5 occurrences	2019-03-16 11:45:22 -04:00
Spencer Gibb	9965c61542	Disable flatten plugin	2019-03-13 16:30:32 -04:00
Dave Syer	093b0882b5	Add flatten plugin to build parents	2019-03-13 09:51:50 +00:00
Marcin Grzejszczak	beaf83d474	Whitelisted this branch	2019-03-07 15:36:12 +01:00
Marcin Grzejszczak	b2373e2c50	HTTP to HTTPS	2019-03-07 15:12:55 +01:00
Marcin Grzejszczak	7f5ba64aa7	Commenting out the LineLength requirement The Boot formatter and the line length check are contradictory. Let's not check the line length.	2019-02-25 16:11:25 +01:00
Ryan Baxter	e26366fbce	Bumping to 2.0.6.BUILD-SNAPSHOT	2019-02-21 11:38:14 -05:00
Ryan Baxter	6a78cf2e85	2.0.5.RELEASE	2019-02-21 11:29:56 -05:00
Marcin Grzejszczak	a992f3d706	Updated build	2019-02-15 17:10:27 +01:00
buildmaster	713a16e110	Bumping versions to 2.1.4.BUILD-SNAPSHOT after release	2019-02-15 14:16:02 +00:00
buildmaster	256b86c191	Going back to snapshots	2019-02-15 14:16:01 +00:00
buildmaster	d383f11a98	Update SNAPSHOT to 2.1.3.RELEASE	2019-02-15 14:14:12 +00:00
Ryan Baxter	9474ca2e3d	Use Boot 2.1.3	2019-02-15 09:05:26 -05:00
buildmaster	4c0ff24db6	Bumping versions	2019-02-14 17:20:37 +00:00
Marcin Grzejszczak	677ed92bcb	Update pom.xml	2019-02-14 18:17:58 +01:00
buildmaster	8b6fb7d48b	Bumping versions	2019-02-14 17:16:14 +00:00
Chin Huang	82aa564d22	Exhort contributors to not edit the generated README.adoc file (#87 )	2019-02-12 15:53:35 -05:00
Marcin Grzejszczak	0b71752b7b	Updated Groovy style	2019-02-08 16:45:56 +01:00
Marcin Grzejszczak	9b037574ed	Updated Groovy style	2019-02-08 16:18:02 +01:00
Marcin Grzejszczak	c6052d025c	Updated Groovy style	2019-02-08 16:04:56 +01:00
Olga Maciaszek-Sharma	c144394179	Revert incorrect backward change in inspection setup.	2019-02-08 13:50:54 +01:00
Olga Maciaszek-Sharma	3bd7aa065c	Merge remote-tracking branch 'origin/master'	2019-02-07 19:56:07 +01:00
Olga Maciaszek-Sharma	83ed333158	Add "excludeScope", cause "scope" was not handled correctly for inner classes.	2019-02-07 19:54:46 +01:00
Spencer Gibb	549410b7df	Update to 120 right margin	2019-02-07 13:41:37 -05:00
Marcin Grzejszczak	be7927d350	Updated readme	2019-02-07 19:12:14 +01:00
Marcin Grzejszczak	70bcc3f1c0	Added more concrete checkstyle setup	2019-02-07 19:02:08 +01:00
Marcin Grzejszczak	a129f34039	Added editorconfig	2019-02-07 15:15:27 +01:00
Marcin Grzejszczak	76521f9186	Fixed the order of checkstyles	2019-02-07 14:55:06 +01:00
Marcin Grzejszczak	87faa674cb	Removed duplicated format plugin	2019-02-07 14:48:53 +01:00
Marcin Grzejszczak	455691108e	Changed the order of formatting and checkstyle	2019-02-07 14:38:20 +01:00
Marcin Grzejszczak	3157fe7adf	Updated spring boot java conventions	2019-02-07 11:27:43 +01:00
Marcin Grzejszczak	e14be3ccae	Added examples to suppressions	2019-02-05 16:46:37 +01:00
Olga Maciaszek-Sharma	2d9d850679	Moved Netflix checkstyle suppressions back to project.	2019-02-05 13:01:40 +01:00
Marcin Grzejszczak	4541cb274b	Added checkstyle documentation	2019-02-05 09:53:15 +01:00
Marcin Grzejszczak	abef739438	Updated the checkstyle location	2019-02-05 09:39:22 +01:00
Marcin Grzejszczak	8e520c45d0	Searches for suppressions under src/checkstyle/checkstyle-suppresions.xml	2019-02-05 09:31:34 +01:00
Marcin Grzejszczak	5995da49aa	Added an option for additional suppression files	2019-02-05 09:25:21 +01:00
Marcin Grzejszczak	2f6cc5a199	Added sample folder to suppresions	2019-02-04 16:18:59 +01:00
Marcin Grzejszczak	7abbd131bf	Added build and target to skipped locations	2019-02-04 15:53:12 +01:00
Olga Maciaszek-Sharma	da9d52773d	Add checkstyle suppressions for illegal imports necessary for some Netflix types.	2019-02-04 12:04:34 +01:00
Marcin Grzejszczak	6b947f96b8	Parametrized suppressions	2019-02-02 11:36:12 +01:00
Marcin Grzejszczak	56150ea5ea	Added override checkstyle rule	2019-02-01 15:06:24 +01:00
Olga Maciaszek-Sharma	f5692c711b	Merge remote-tracking branch 'origin/master'	2019-01-31 19:12:33 +01:00
Olga Maciaszek-Sharma	d5908b1898	Adding back guava import - added suppressions directly in SCNetflix.	2019-01-31 19:12:21 +01:00
Marcin Grzejszczak	75dfbe1b71	parametrized failures on error and warning for checkstyle	2019-01-31 17:40:46 +01:00
Olga Maciaszek-Sharma	b763c7e76d	Fix import-control setup.	2019-01-31 17:09:59 +01:00
Olga Maciaszek-Sharma	8190edd353	Fix import-control setup.	2019-01-31 17:07:33 +01:00
Olga Maciaszek-Sharma	26146271cc	Add import control setup in checkstyle.xml.	2019-01-31 17:01:57 +01:00
Olga Maciaszek-Sharma	b42078d051	Switch from illegal import definition in Guava to import-control verification.	2019-01-31 16:42:44 +01:00
Olga Maciaszek-Sharma	0d3107bc2a	Remove verification for empty javadoc after discussing in channel.	2019-01-30 18:02:59 +01:00
Olga Maciaszek-Sharma	b62df46daa	Switch to public scope for Javadoc Type check.	2019-01-30 17:56:37 +01:00
Olga Maciaszek-Sharma	6482383cc4	Merge remote-tracking branch 'origin/master'	2019-01-30 17:42:06 +01:00
Olga Maciaszek-Sharma	626bbb6d07	Commenting out some rules after discussing it in Spring Cloud channel.	2019-01-30 17:41:51 +01:00
Marcin Grzejszczak	9c3dddb63c	Set tab width to 1	2019-01-30 13:00:10 +01:00
Marcin Grzejszczak	0d5e152e7a	Added line length to be 120	2019-01-29 20:02:06 +01:00
Marcin Grzejszczak	58cbac5e86	Updated Checkstyle with latest Boot entries, removed this. check; fixes gh-86	2019-01-29 17:58:55 +01:00
Ryan Baxter	cc3527e7ba	Bumping version to 2.1.3.BUILD-SNAPSHOT	2019-01-22 11:59:41 -05:00
Ryan Baxter	ae3ecc8f3c	Revert "Version changes for 2.1.2.RELEASE" This reverts commit `6cbeee8435`.	2019-01-22 11:57:21 -05:00
Ryan Baxter	6cbeee8435	Version changes for 2.1.2.RELEASE	2019-01-22 11:54:26 -05:00
Daniel Zou	ad99cb0e55	Add Awaitility and AssertJ assumptions to avoidStaticImportCheck exclusions (#85 )	2019-01-21 17:56:38 +01:00
Spencer Gibb	4e61a5a4c2	Bumps boot to 2.0.8.RELEASE	2019-01-12 12:50:07 -05:00
Spencer Gibb	d8bbfe6bd2	Bumps boot to 2.1.2.RELEASE	2019-01-12 12:44:34 -05:00
buildmaster	8f8166242b	Bumping versions to 2.1.2.BUILD-SNAPSHOT after release	2019-01-08 10:00:37 +00:00
buildmaster	7cb2441c7e	Going back to snapshots	2019-01-08 10:00:37 +00:00
buildmaster	fa1827bdd6	Update SNAPSHOT to 2.1.1.RELEASE	2019-01-08 09:51:30 +00:00
Spencer Gibb	1bc5ca3d2e	Update to 2.1.1.BUILD-SNAPSHOT	2019-01-07 12:31:55 -05:00
buildmaster	3a68656c23	Bumping versions to 2.0.5.BUILD-SNAPSHOT after release	2018-10-23 15:40:08 +00:00
buildmaster	97ffe0a406	Going back to snapshots	2018-10-23 15:40:08 +00:00
buildmaster	6a41df677a	Update SNAPSHOT to 2.0.4.RELEASE	2018-10-23 15:38:38 +00:00
Ryan Baxter	f6a5a3eea1	Bumping the boot version for Finchley.SR2 release	2018-10-17 15:45:12 -04:00