Bumping versions to 2.1.12.BUILD-SNAPSHOT after release

This reverts commit 5d8b1fa812.

.circleci/config.yml

@@ -0,0 +1,39 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-build-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-build-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts

.editorconfig

@@ -0,0 +1,24 @@
+root = true
+
+[*.java]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.groovy]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.yaml]
+indent_style = space
+indent_size = 2

.github/CONTRIBUTING.md

@@ -0,0 +1,45 @@
+
+# Contributing
+
+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
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+## Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+## Code of Conduct
+This project adheres to the Contributor Covenant [code of
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+## Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
+  [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) 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
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* 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 [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+  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).

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--
+Thanks for raising a Spring Cloud issue. What sort of issue are you raising?
+
+Question
+
+Please ask questions about how to use something, or to understand why something isn't
+working as you expect it to, on Stack Overflow using the spring-cloud tag.
+
+Bug report
+
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.
+
+Enhancement
+
+Please start by describing the problem that you are trying to solve. There may already
+be a solution, or there may be a way to solve it that you hadn't considered.
+-->

.gitignore

@@ -16,3 +16,5 @@ _site/
 .idea
 *.iml
 .factorypath
+.vscode/
+.flattened-pom.xml

.settings.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>

.travis.yml

@@ -1,26 +0,0 @@
-sudo: false
-language: java
-before_install:
-  - echo Using MVN_GOAL=${MVN_GOAL} for SPRING_CLOUD_BUILD=${SPRING_CLOUD_BUILD}
-  - git config user.name "$GIT_NAME"
-  - git config user.email "$GIT_EMAIL"
-  - git config credential.helper "store --file=.git/credentials"
-  - echo "https://$GH_TOKEN:@github.com" > .git/credentials
-  - gem install asciidoctor
-install:
-- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true
-- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"'
-script:
-- './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true'
-env:
-  global:
-  - GIT_NAME="Dave Syer"
-  - GIT_EMAIL=dsyer@pivotal.io
-  - CI_DEPLOY_USERNAME=buildmaster
-  - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep "^.*/.*$" && echo true || echo false)
-  - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false)
-  - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install)
-  - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //')
-  - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false)
-  - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone)
-  - secure: "KRJQg6soMWudREJ11ocGK8I4OuhIehvy/ehTjBxvyATEwL6rXA9dKPGfb0OAscEgIpNxW1cezH8vUSaSZGFhx6LF5VnJ9Mh39pi9uYm9GMjQ61B4d5GaRjbGj/fXBd8kGubDO8kmjkDGGgkjWXfYZa/WIQ4kVWCIB5dVV9XJ0Lw="

LICENSE.txt

@@ -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,

README.adoc

@@ -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,143 @@ 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.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
+
+.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-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
@@ -109,13 +248,9 @@ approach of generating documentation just add these plugins to your `docs` modul
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
 					</plugin>
-					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId> <3>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <4>
+						<artifactId>maven-antrun-plugin</artifactId> <3>
 						<inherited>false</inherited>
 					</plugin>
 				</plugins>
@@ -125,7 +260,6 @@ approach of generating documentation just add these plugins to your `docs` modul
 ----
 <1> This plugin downloads and unpacks the resources of the `spring-cloud-build-docs` module
 <2> This plugin is required to parse the Asciidoctor documentation
-<3> This plugin converts the Asciidoctor documentation into single and multi page docs
-<4> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
+<3> This plugin is required to copy resources into proper final destinations and to generate main README.adoc
 
 IMPORTANT: The order of plugin declaration is important!

docs/pom.xml

@@ -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>1.3.10.RELEASE</version>
+		<version>2.1.12.BUILD-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
-		<docs.whitelisted.branches>1.2.x,1.3.x</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>

docs/src/main/asciidoc/README.adoc

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

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

@@ -31,7 +31,7 @@ credentials and you already have those.
 
 The projects that require middleware generally include a
 `docker-compose.yml`, so consider using
-http://compose.docker.io/[Docker Compose] to run the middeware servers
+https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
 in Docker containers. See the README in the
 https://github.com/spring-cloud-samples/scripts[scripts demo
 repository] for specific instructions about the common cases of mongo,
@@ -53,13 +53,13 @@ a modified file in the correct place. Just commit it and push the change.
 
 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.
 
 ==== Importing into eclipse with m2eclipse
-We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".
 

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

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

docs/src/main/asciidoc/code-of-conduct.adoc

@@ -41,5 +41,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.
 
 This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

docs/src/main/asciidoc/contributing.adoc

@@ -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
@@ -26,7 +28,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
@@ -39,6 +41,138 @@ 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.

docs/src/main/asciidoc/ghpages.sh

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

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+spring-cloud-build.adoc

docs/src/main/docbook/css/highlight.css

@@ -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;
 }

docs/src/main/docbook/css/manual-multipage.css

@@ -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 {

docs/src/main/docbook/css/manual-singlepage.css

@@ -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;
 }
 

docs/src/main/docbook/css/manual.css

@@ -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;
 }

docs/src/main/docbook/xsl/common.xsl

@@ -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.sourceforge.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>

docs/src/main/docbook/xsl/epub.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
@@ -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.sourceforge.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"/>

docs/src/main/docbook/xsl/html-multipage.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">

docs/src/main/docbook/xsl/html-singlepage.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

docs/src/main/docbook/xsl/html.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
@@ -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.sourceforge.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 -->

docs/src/main/docbook/xsl/pdf.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
@@ -22,7 +22,7 @@ under the License.
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 				xmlns:d="http://docbook.org/ns/docbook"
 				xmlns:fo="http://www.w3.org/1999/XSL/Format"
-				xmlns:xslthl="http://xslthl.sf.net"
+				xmlns:xslthl="http://xslthl.sourceforge.net/"
 				xmlns:xlink='http://www.w3.org/1999/xlink'
 				xmlns:exsl="http://exslt.org/common"
 				exclude-result-prefixes="exsl xslthl d xlink"
@@ -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>

docs/src/main/docbook/xsl/xslthl-config.xml

@@ -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.sourceforge.net/"/>
 </xslthl-config>

docs/src/main/docbook/xsl/xslthl/asciidoc-hl.xml

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

docs/src/main/docbook/xsl/xslthl/bourne-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for SH
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2010 Mathieu Malaterre
 
 This software is provided 'as-is', without any express or implied
@@ -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 -->

docs/src/main/docbook/xsl/xslthl/c-hl.xml

@@ -3,7 +3,7 @@
 Syntax highlighting definition for C
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/cpp-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for C++
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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 -->

docs/src/main/docbook/xsl/xslthl/csharp-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for C#
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/css-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for CSS files
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2011-2012 Martin Hujer, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -26,151 +26,151 @@ freely, subject to the following restrictions:
 Martin Hujer <mhujer at users.sourceforge.net>
 Michiel Hendriks <elmuerte at users.sourceforge.net>
 
-Reference: http://www.w3.org/TR/CSS21/propidx.html
+Reference: https://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>

docs/src/main/docbook/xsl/xslthl/html-hl.xml

@@ -7,116 +7,116 @@
   myxml-hl.xml - konfigurace zvyraznovace XML, ktera zvlast zvyrazni
                  HTML elementy a XSL elementy
 
-  This file has been customized for the Asciidoctor project (http://asciidoctor.org).
+  This file has been customized for the Asciidoctor project (https://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>

docs/src/main/docbook/xsl/xslthl/ini-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for ini files
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied

docs/src/main/docbook/xsl/xslthl/java-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for Java
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/javascript-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for JavaScript
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/json-hl.xml

@@ -20,7 +20,7 @@
 		<suffix>f</suffix>
 		<suffix>d</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>true</keyword>

docs/src/main/docbook/xsl/xslthl/perl-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for Perl
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/php-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for PHP
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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 -->

docs/src/main/docbook/xsl/xslthl/properties-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for Java
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied

docs/src/main/docbook/xsl/xslthl/python-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for Python
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/ruby-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for Ruby
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2005-2008 Michal Molhanec, Jirka Kosek, Michiel Hendriks
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/sql2003-hl.xml

@@ -4,7 +4,7 @@
 Syntax highlighting definition for SQL:1999
 
 xslthl - XSLT Syntax Highlighting
-http://sourceforge.net/projects/xslthl/
+https://sourceforge.net/projects/xslthl/
 Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
 
 This software is provided 'as-is', without any express or implied
@@ -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>

docs/src/main/docbook/xsl/xslthl/yaml-hl.xml

@@ -20,7 +20,7 @@
 		<suffix>f</suffix>
 		<suffix>d</suffix>
 		<suffix>l</suffix>
-		<ignoreCase />
+		<ignoreCase/>
 	</highlighter>
 	<highlighter type="keywords">
 		<keyword>true</keyword>

docs/src/main/ruby/generate_readme.sh

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

mvnw

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

mvnw.cmd

@@ -1,145 +1,145 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@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
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-set MAVEN_CMD_LINE_ARGS=%*
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@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    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
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+set MAVEN_CMD_LINE_ARGS=%*
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 
 set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -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>1.3.10.RELEASE</version>
+	<version>2.1.12.BUILD-SNAPSHOT</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>
@@ -16,26 +18,68 @@
 	</modules>
 	<url>https://spring.io/spring-cloud</url>
 	<properties>
-		<java.version>1.7</java.version>
-		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<java.version>1.8</java.version>
+		<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>
-		<checkstyle.version>2.17</checkstyle.version>
-		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>1.5.14.RELEASE</spring-boot.version>
-		<spring-cloud-build.version>1.3.10.RELEASE</spring-cloud-build.version>
+		<spring-boot.version>2.1.13.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.1.12.BUILD-SNAPSHOT</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 -->
+		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
+		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
+		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
+		<puppycrawl-tools-checkstyle.version>8.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>
+		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
+		<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
+		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+		<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
+		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+		<git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
+		<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
+		<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
+		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+		<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
+		<asciidoctor-maven-plugin.version>1.5.7</asciidoctor-maven-plugin.version>
+		<docbkx-maven-plugin.version>2.0.17</docbkx-maven-plugin.version>
+		<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
+		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
+		<license-maven-plugin.version>1.16</license-maven-plugin.version>
+		<spring-javaformat-checkstyle.version>0.0.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>
@@ -57,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>
@@ -87,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>
@@ -97,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>
@@ -107,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>
@@ -117,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>
@@ -148,7 +195,7 @@ limitations under the License.
 		<plugins>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>${maven-javadoc-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>javadoc</id>
@@ -159,12 +206,14 @@ limitations under the License.
 					</execution>
 				</executions>
 				<configuration>
+					<!-- TODO: We need to patch the javadocs instead of disabling this -->
+					<failOnError>false</failOnError>
 					<quiet>true</quiet>
 				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
+				<version>${maven-source-plugin.version}</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -175,9 +224,48 @@ 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>
+				<!-- Apply more sensible defaults for user projects -->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-eclipse-plugin</artifactId>
+					<version>${maven-eclipse-plugin.version}</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
@@ -185,25 +273,13 @@ limitations under the License.
 					<configuration>
 						<source>${maven.compiler.source}</source>
 						<target>${maven.compiler.target}</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-eclipse-plugin</artifactId>
-					<version>${maven-eclipse-plugin.version}</version>
-				</plugin>
-				<!-- Apply more sensible defaults for user projects -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>${maven.compiler.source}</source>
-						<target>${maven.compiler.target}</target>
+						<compilerArgument>-parameters</compilerArgument>
 					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-failsafe-plugin</artifactId>
+					<version>${maven-failsafe-plugin.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -216,12 +292,13 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>${maven-jar-plugin.version}</version>
 					<configuration>
 						<archive>
 							<manifest>
 								<mainClass>${start-class}</mainClass>
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+								<addDefaultImplementationEntries>true
+								</addDefaultImplementationEntries>
 							</manifest>
 						</archive>
 					</configuration>
@@ -229,11 +306,12 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.7</version>
+					<version>${maven-antrun-plugin.version}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
+					<version>${maven-surefire-plugin.version}</version>
 					<configuration>
 						<includes>
 							<include>**/*Tests.java</include>
@@ -247,12 +325,14 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-war-plugin</artifactId>
+					<version>${maven-war-plugin.version}</version>
 					<configuration>
 						<failOnMissingWebXml>false</failOnMissingWebXml>
 						<archive>
 							<manifest>
 								<mainClass>${start-class}</mainClass>
-								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+								<addDefaultImplementationEntries>true
+								</addDefaultImplementationEntries>
 							</manifest>
 						</archive>
 					</configuration>
@@ -260,6 +340,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
+					<version>${exec-maven-plugin.version}</version>
 					<configuration>
 						<mainClass>${start-class}</mainClass>
 					</configuration>
@@ -267,7 +348,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.6</version>
+					<version>${maven-resources-plugin.version}</version>
 					<configuration>
 						<delimiters>
 							<delimiter>${resource.delimiter}</delimiter>
@@ -275,37 +356,79 @@ limitations under the License.
 						<useDefaultDelimiters>false</useDefaultDelimiters>
 					</configuration>
 				</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>${checkstyle.version}</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.springframework.cloud</groupId>
-						<artifactId>spring-cloud-build-tools</artifactId>
-						<version>${spring-cloud-build.version}</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<configLocation>checkstyle.xml</configLocation>
-					<headerLocation>LICENSE.txt</headerLocation>
-					<consoleOutput>true</consoleOutput>
-					<failsOnError>true</failsOnError>
-				</configuration>
-				<executions>
-					<execution>
-						<id>validate</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+				<plugin>
+					<groupId>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>
+					<version>${maven-checkstyle-plugin.version}</version>
+					<dependencies>
+						<dependency>
+							<groupId>com.puppycrawl.tools</groupId>
+							<artifactId>checkstyle</artifactId>
+							<version>${puppycrawl-tools-checkstyle.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>io.spring.javaformat</groupId>
+							<artifactId>spring-javaformat-checkstyle</artifactId>
+							<version>${spring-javaformat-checkstyle.version}</version>
+						</dependency>
+						<dependency>
+							<groupId>org.springframework.cloud</groupId>
+							<artifactId>spring-cloud-build-tools</artifactId>
+							<version>${spring-cloud-build.version}</version>
+						</dependency>
+					</dependencies>
+					<executions>
+						<execution>
+							<id>checkstyle-validation</id>
+							<phase>validate</phase>
+							<inherited>true</inherited>
+							<configuration>
+								<skip>${disable.checks}</skip>
+								<configLocation>checkstyle.xml</configLocation>
+								<headerLocation>checkstyle-header.txt</headerLocation>
+								<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>
+									${maven-checkstyle-plugin.includeTestSourceDirectory}
+								</includeTestSourceDirectory>
+								<failsOnError>${maven-checkstyle-plugin.failsOnError}
+								</failsOnError>
+								<failOnViolation>
+									${maven-checkstyle-plugin.failOnViolation}
+								</failOnViolation>
+							</configuration>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 				<plugin>
 					<groupId>pl.project13.maven</groupId>
 					<artifactId>git-commit-id-plugin</artifactId>
-					<version>2.1.11</version>
+					<version>${git-commit-id-plugin.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -317,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 -->
@@ -340,7 +465,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>2.2</version>
+					<version>${maven-shade-plugin.version}</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
@@ -349,7 +474,8 @@ limitations under the License.
 						</dependency>
 					</dependencies>
 					<configuration>
-						<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
+						<keepDependenciesWithProvidedScope>true
+						</keepDependenciesWithProvidedScope>
 						<createDependencyReducedPom>true</createDependencyReducedPom>
 						<filters>
 							<filter>
@@ -370,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>
@@ -391,7 +522,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.4.1</version>
+					<version>${maven-enforcer-plugin.version}</version>
 					<executions>
 						<execution>
 							<id>enforce-versions</id>
@@ -445,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>
@@ -536,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>
@@ -547,6 +682,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -576,39 +712,6 @@ limitations under the License.
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>java7</id>
-			<activation>
-				<file>
-					<missing>.jdk8</missing>
-				</file>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>animal-sniffer-maven-plugin</artifactId>
-						<version>1.16</version>
-						<configuration>
-							<signature>
-								<groupId>org.codehaus.mojo.signature</groupId>
-								<artifactId>java17</artifactId>
-								<version>1.0</version>
-							</signature>
-						</configuration>
-						<executions>
-							<execution>
-								<id>enforce-java-7</id>
-								<phase>test</phase>
-								<goals>
-									<goal>check</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<!-- TODO: remove this (it's covered with checkstyle, but not all projects use that yet -->
 			<id>imports</id>
@@ -629,6 +732,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
+						<version>${exec-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>imports</id>
@@ -666,7 +770,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-dependency-plugin</artifactId>
-							<version>3.0.0</version>
+							<version>${maven-dependency-plugin.version}</version>
 							<executions>
 								<execution>
 									<id>unpack-docs</id>
@@ -677,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>
@@ -693,7 +801,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctor-maven-plugin</artifactId>
-							<version>1.5.5</version>
+							<version>${asciidoctor-maven-plugin.version}</version>
 							<dependencies>
 								<dependency>
 									<groupId>io.spring.asciidoctor</groupId>
@@ -709,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>
@@ -728,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>
@@ -747,16 +864,21 @@ limitations under the License.
 						<plugin>
 							<groupId>com.agilejava.docbkx</groupId>
 							<artifactId>docbkx-maven-plugin</artifactId>
-							<version>2.0.15</version>
+							<version>${docbkx-maven-plugin.version}</version>
 							<configuration>
-								<sourceDirectory>${basedir}/target/generated-docs</sourceDirectory>
+								<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>
@@ -781,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>
@@ -807,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>
@@ -834,12 +968,13 @@ limitations under the License.
 						<plugin>
 							<groupId>org.codehaus.mojo</groupId>
 							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>1.12</version>
+							<version>${build-helper-maven-plugin.version}</version>
 							<inherited>false</inherited>
 						</plugin>
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-antrun-plugin</artifactId>
+							<version>${maven-antrun-plugin.version}</version>
 							<dependencies>
 								<dependency>
 									<groupId>ant-contrib</groupId>
@@ -882,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"/>
@@ -899,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>
@@ -915,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:
@@ -930,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>
@@ -942,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>
@@ -958,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>
@@ -978,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>
@@ -1007,7 +1172,7 @@ limitations under the License.
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>
-							<version>2.2.1</version>
+							<version>${artifactory-maven-plugin.version}</version>
 							<executions>
 								<execution>
 									<id>build-info</id>
@@ -1020,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>
@@ -1059,6 +1226,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-surefire-plugin</artifactId>
+						<version>${maven-surefire-plugin.version}</version>
 						<configuration>
 							<properties>
 								<property>
@@ -1089,7 +1257,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>license-maven-plugin</artifactId>
-						<version>1.8</version>
+						<version>${license-maven-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>aggregate-licenses</id>

spring-cloud-build-dependencies/pom.xml

@@ -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>1.3.10.RELEASE</version>
-	<name>spring-cloud-build-tools</name>
+	<version>2.1.12.BUILD-SNAPSHOT</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>1.5.14.RELEASE</version>
+		<version>2.1.13.RELEASE</version>
+		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<lombok.version>1.16.14</lombok.version>
-		<spring-boot.version>1.5.14.RELEASE</spring-boot.version>
+		<spring-boot.version>2.1.13.RELEASE</spring-boot.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -32,19 +34,15 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>org.projectlombok</groupId>
-				<artifactId>lombok</artifactId>
-				<version>${lombok.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<distributionManagement>
 		<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>
@@ -74,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>
@@ -89,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>
@@ -97,6 +98,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

spring-cloud-build-tools/pom.xml

@@ -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,14 +11,14 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.10.RELEASE</version>
+		<version>2.1.12.BUILD-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.puppycrawl.tools</groupId>
 			<artifactId>checkstyle</artifactId>
-			<version>7.6</version>
+			<version>${puppycrawl-tools-checkstyle.version}</version>
 		</dependency>
 	</dependencies>
-	
+
 </project>

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

@@ -0,0 +1,15 @@
+<?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="[\\/]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>

spring-cloud-build-tools/src/main/resources/LICENSE.txt

@@ -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,

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

@@ -0,0 +1,17 @@
+^\Q/*\E$
+^\Q * Copyright \E20\d\d\-20\d\d\Q the original author or authors.\E$
+^\Q *\E$
+^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
+^\Q * you may not use this file except in compliance with the License.\E$
+^\Q * You may obtain a copy of the License at\E$
+^\Q *\E$
+^\Q *      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$
+^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
+^\Q * See the License for the specific language governing permissions and\E$
+^\Q * limitations under the License.\E$
+^\Q */\E$
+^$
+^.*$

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

@@ -1,25 +1,201 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
 		"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-	<module name="TreeWalker">
-		<!-- this. in front of fields -->
-		<module name="RequireThis">
-			<property name="checkMethods" value="false"/>
-		</module>
-		<!-- tabs instead of spaces -->
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* "/>
-			<property name="message" value="Indent must use tab characters"/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="UnusedImports">
-			<property name="processJavadoc" value="true" />
-		</module>
-		<module name="RedundantImport"/>
-		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck" >
+		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+
+	<module name="SuppressionFilter">
+		<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"/>
+	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
+		<property name="lineSeparator" value="lf"/>
+	</module>
+
+	<!-- TreeWalker Checks -->
+	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
+		<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"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingOverrideCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck">
+			<property name="allowSamelineSingleParameterlessAnnotation"
+					  value="false"/>
+		</module>
+
+		<!-- Block Checks -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
+			<property name="option" value="text"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck">
+			<property name="option" value="alone"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck"/>
+
+		<!-- Class Design -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck" />-->
+
+		<!-- Coding -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck">
+			<property name="max" value="3"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck">
+			<property name="max" value="3"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
+			<property name="max" value="3"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
+			<property name="checkMethods" value="false" />
+			<property name="validateOnlyOverlapping" value="false" />
+		</module>-->
+		<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
+
+		<!-- Imports -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">-->
+		<!--<property name="excludes"-->
+		<!--value="io.restassured.RestAssured.*, org.assertj.core.api.Assertions.*, org.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"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.imports.ImportOrderCheck">
+			<property name="groups" value="java,/^javax?\./,*,org.springframework"/>
+			<property name="ordered" value="true"/>
+			<property name="separated" value="true"/>
+			<property name="option" value="bottom"/>
+			<property name="sortStaticImportsAlphabetically" value="true"/>
+		</module>
+
+		<!-- Javadoc Comments -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
+			<property name="scope" value="public"/>
+			<property name="excludeScope" value="package"/>
+			<property name="authorFormat" value=".+\s.+"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
+			<property name="scope" value="public"/>
+			<property name="excludeScope" value="package"/>
+			<property name="allowMissingJavadoc" value="true"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
+			<property name="scope" value="public"/>
+		</module>
+		<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"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
+			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+			<property name="tagOrder"
+					  value="@param, @return, @throws, @since, @deprecated, @see"/>
+		</module>
+
+		<!-- Miscellaneous -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck">
+			<property name="tokens" value="BLOCK_COMMENT_BEGIN"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
+
+		<!-- Modifiers -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>
+
+		<!-- Regexp -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="format" value="^\t* +\t*\S"/>
+			<property name="message"
+					  value="Line has leading space characters; indentation should be performed with tabs only."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+		<!--<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" />
+			<property name="message"
+					  value="Please use BDDMockito imports." />
+			<property name="ignoreComments" value="true" />
+		</module>-->
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format"
+					  value="org\.junit\.(Assert|jupiter\.api\.Assertions)\.assert"/>
+			<property name="message"
+					  value="Please use AssertJ imports."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpCheck">
+			<property name="format" value="[ \t]+$"/>
+			<property name="illegalPattern" value="true"/>
+			<property name="message" value="Trailing whitespace"/>
+		</module>
+
+		<!-- Whitespace -->
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
+			<property name="tokens"
+					  value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
+		<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
 	</module>
 </module>

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

@@ -0,0 +1,5 @@
+<component name="InspectionProjectProfileManager">
+	<profile version="1.0">
+		<option name="myName" value="Project Default"/>
+	</profile>
+</component>

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

@@ -0,0 +1,96 @@
+<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="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">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.springframework" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+  </GroovyCodeStyleSettings>
+  <JavaCodeStyleSettings>
+    <option name="TEST_NAME_SUFFIX" value="Tests" />
+    <option name="VISIBILITY" value="packageLocal" />
+    <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="IMPORT_LAYOUT_TABLE">
+      <value>
+        <package name="java" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="javax" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="org.springframework" withSubpackages="true" static="false" />
+        <emptyLine />
+        <package name="" withSubpackages="true" static="true" />
+      </value>
+    </option>
+    <option name="ENABLE_JAVADOC_FORMATTING" value="false" />
+  </JavaCodeStyleSettings>
+  <codeStyleSettings language="Groovy">
+    <option name="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="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" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="SPACE_WITHIN_BRACES" value="true" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+    <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+    <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="XML">
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

spring-cloud-dependencies-parent/pom.xml

@@ -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>1.3.10.RELEASE</version>
+	<version>2.1.12.BUILD-SNAPSHOT</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,15 +61,12 @@ 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>
 		</developer>
 	</developers>
-	<prerequisites>
-		<maven>3.0.0</maven>
-	</prerequisites>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -74,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>
@@ -105,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>
@@ -120,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>
@@ -128,6 +132,7 @@ limitations under the License.
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -190,6 +195,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>