Update SNAPSHOT to 2.1.6.RELEASE

URL Cleanup

.editorconfig

@@ -21,8 +21,4 @@ indent_size = 2
 
 [*.yaml]
 indent_style = space
-indent_size = 2
-
-[*.sh]
-indent_style = space
-indent_size = 4
+indent_size = 2

.gitignore

@@ -18,4 +18,3 @@ _site/
 .factorypath
 .vscode/
 .flattened-pom.xml
-.DS_Store

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "docs/src/test/bats/test_helper/bats-assert"]
-	path = docs/src/test/bats/test_helper/bats-assert
-	url = https://github.com/ztombol/bats-assert
-[submodule "docs/src/test/bats/test_helper/bats-support"]
-	path = docs/src/test/bats/test_helper/bats-support
-	url = https://github.com/ztombol/bats-support

README.adoc

@@ -179,7 +179,6 @@ $ touch .springformat
 ==== 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/
 ----
@@ -220,7 +219,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring
 
 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.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`.
 
@@ -240,118 +239,26 @@ approach of generating documentation just add these plugins to your `docs` modul
 			<id>docs</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId> <1>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId> <3>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId> <4>
+						<artifactId>maven-dependency-plugin</artifactId> <1>
 					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <6>
+						<artifactId>maven-antrun-plugin</artifactId> <3>
+						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
-<2> This plugin downloads the resources of the `spring-cloud-build-docs` module
-<3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
-<4> This plugin generates an `adoc` file with all the configuration properties from the classpath
-<5> This plugin is required to parse the Asciidoctor documentation
-<6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<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 is required to copy resources into proper final destinations and to generate main README.adoc
 
-IMPORTANT: The order of plugin declaration is important!
-
-In order for the build to generate the `adoc` file with all your configuration properties, your `docs` module should contain all the dependencies on the classpath, that you would want to scan for configuration properties. The file will be output to `${docsModule}/src/main/asciidoc/_configprops.adoc` file (configurable via the `configprops.path` property).
-
-If you want to modify which of the configuration properties are put in the table, you can tweak the `configprops.inclusionPattern` pattern to include only a subset of the properties (e.g. `<configprops.inclusionPattern>spring.sleuth.*</configprops.inclusionPattern>`).
-
-Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you can reuse.
-
-[source,xml]
-----
-<attributes>
-	<docinfo>shared</docinfo>
-	<allow-uri-read>true</allow-uri-read>
-	<nofooter/>
-	<toc>left</toc>
-	<toc-levels>4</toc-levels>
-	<sectlinks>true</sectlinks>
-	<sources-root>${project.basedir}/src</sources-root>
-	<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-	<generated-resources-root>${project.basedir}/target/generated-resources
-	</generated-resources-root>
-	<!-- Use this attribute the reference code from another module -->
-	<project-root>${maven.multiModuleProjectDirectory}</project-root>
-	<!-- It's mandatory for you to pass the docs.main property -->
-	<github-repo>${docs.main}</github-repo>
-	<github-raw>
-		https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
-	</github-raw>
-	<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
-	</github-code>
-	<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-	<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-	<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
-	</github-master-code>
-	<index-link>${index-link}</index-link>
-
-	<!-- Spring Cloud specific -->
-	<!-- for backward compatibility -->
-	<spring-cloud-version>${project.version}</spring-cloud-version>
-	<project-version>${project.version}</project-version>
-	<github-tag>${github-tag}</github-tag>
-	<version-type>${version-type}</version-type>
-	<docs-url>${docs-url}</docs-url>
-	<raw-docs-url>${raw-docs-url}</raw-docs-url>
-	<project-version>${project.version}</project-version>
-	<project-name>${docs.main}</project-name>
-</attributes>
-----
-
-== Updating the guides
-
-We assume that your project contains guides under the `guides` folder.
-
-```
-.
-└── guides
-    ├── gs-guide1
-    ├── gs-guide2
-    └── gs-guide3
-```
-
-This means that the project contains 3 guides that would
-correspond to the following guides in Spring Guides org.
-
-- https://github.com/spring-guides/gs-guide1
-- https://github.com/spring-guides/gs-guide2
-- https://github.com/spring-guides/gs-guide3
-
-If you deploy your project with the `-Pguides` profile like this
-
-```
-$ ./mvnw clean deploy -Pguides
-```
-
-what will happen is that for GA project versions, we will clone `gs-guide1`, `gs-guide2` and `gs-guide3` and update their contents with the ones being under your `guides` project.
-
-You can skip this by either not adding the `guides` profile, or passing the `-DskipGuides` system property when the profile is turned on.
-
-You can configure the project version passed to guides via the `guides-project.version` (defaults to `${project.version}`). The phase at which guides get updated can be configured by `guides-update.phase` (defaults to `deploy`).
+IMPORTANT: The order of plugin declaration is important!

circle.yml

@@ -0,0 +1,20 @@
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
+machine:
+  java:
+    version: openjdk8 #Open JDK has the JCE extentions installed by default
+  environment:
+    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+dependencies:
+  override:
+    - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+test:
+  override:
+    - ./mvnw -s .settings.xml clean install 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
+  post:
+    - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+    - bash <(curl -s https://codecov.io/bash)

docs/pom.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 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>
@@ -10,96 +9,22 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M6</version>
+		<version>2.1.6.RELEASE</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
 		<docs.whitelisted.branches>1.2.x,1.3.x,2.0.x,2.1.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
-		<gmavenplus-plugin.version>1.6.1</gmavenplus-plugin.version>
+		<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
 	</properties>
-	<dependencies>
-		<!-- Script -->
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.2</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-xml</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-nio</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-json</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 	<build>
 		<resources>
 			<resource>
 				<directory>src/main</directory>
-				<excludes>
-					<exclude>groovy/**/*.*</exclude>
-				</excludes>
 			</resource>
 		</resources>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>${build-helper-maven-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>add-source</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>add-source</goal>
-						</goals>
-						<configuration>
-							<sources>
-								<source>src/main/groovy</source>
-							</sources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.gmavenplus</groupId>
-				<artifactId>gmavenplus-plugin</artifactId>
-				<version>${gmavenplus-plugin.version}</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>compile</goal>
-							<goal>addSources</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8.2</version>
@@ -111,26 +36,14 @@
 			<id>docs</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
 						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
+					<plugin>
+						<groupId>com.agilejava.docbkx</groupId>
+						<artifactId>docbkx-maven-plugin</artifactId>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
@@ -138,36 +51,5 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>unix</id>
-			<activation>
-				<os>
-					<family>unix</family>
-					<name>Linux</name>
-				</os>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
-						<groupId>org.codehaus.mojo</groupId>
-						<executions>
-							<execution>
-								<id>Run tests</id>
-								<phase>test</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<skip>${skipTests}</skip>
-									<!-- <skip>true</skip> -->
-									<executable>${basedir}/src/test/bash/run-bats.sh</executable>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 </project>

docs/src/main/asciidoc/README.adoc

@@ -56,82 +56,26 @@ approach of generating documentation just add these plugins to your `docs` modul
 			<id>docs</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId> <1>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId> <3>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId> <4>
+						<artifactId>maven-dependency-plugin</artifactId> <1>
 					</plugin>
 					<plugin>
 						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <6>
+						<artifactId>maven-antrun-plugin</artifactId> <3>
+						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
 	</profiles>
 ----
-<2> This plugin downloads sets up all the git information of the project
-<2> This plugin downloads the resources of the `spring-cloud-build-docs` module
-<3> This plugin unpacks the resources of the `spring-cloud-build-docs` module
-<4> This plugin generates an `adoc` file with all the configuration properties from the classpath
-<5> This plugin is required to parse the Asciidoctor documentation
-<6> This plugin is required to copy resources into proper final destinations and to generate main README.adoc and to assert that no files use unresolved links
+<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 is required to copy resources into proper final destinations and to generate main README.adoc
 
-IMPORTANT: The order of plugin declaration is important!
-
-In order for the build to generate the `adoc` file with all your configuration properties, your `docs` module should contain all the dependencies on the classpath, that you would want to scan for configuration properties. The file will be output to `${docsModule}/src/main/asciidoc/_configprops.adoc` file (configurable via the `configprops.path` property).
-
-If you want to modify which of the configuration properties are put in the table, you can tweak the `configprops.inclusionPattern` pattern to include only a subset of the properties (e.g. `<configprops.inclusionPattern>spring.sleuth.*</configprops.inclusionPattern>`).
-
-Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you can reuse.
-
-[source,xml]
-----
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/pom.xml[tags=attributes,indent=0]
-----
-
-== Updating the guides
-
-We assume that your project contains guides under the `guides` folder.
-
-```
-.
-└── guides
-    ├── gs-guide1
-    ├── gs-guide2
-    └── gs-guide3
-```
-
-This means that the project contains 3 guides that would
-correspond to the following guides in Spring Guides org.
-
-- https://github.com/spring-guides/gs-guide1
-- https://github.com/spring-guides/gs-guide2
-- https://github.com/spring-guides/gs-guide3
-
-If you deploy your project with the `-Pguides` profile like this
-
-```
-$ ./mvnw clean deploy -Pguides
-```
-
-what will happen is that for GA project versions, we will clone `gs-guide1`, `gs-guide2` and `gs-guide3` and update their contents with the ones being under your `guides` project.
-
-You can skip this by either not adding the `guides` profile, or passing the `-DskipGuides` system property when the profile is turned on.
-
-You can configure the project version passed to guides via the `guides-project.version` (defaults to `${project.version}`). The phase at which guides get updated can be configured by `guides-update.phase` (defaults to `deploy`).
+IMPORTANT: The order of plugin declaration is important!

docs/src/main/asciidoc/contributing.adoc

@@ -131,7 +131,6 @@ $ touch .springformat
 ==== 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/
 ----
@@ -172,8 +171,8 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring
 
 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.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.
+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

@@ -1,26 +1,15 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Usage: (cd <project root>; ghpages.sh -v <version> -b -c)
 
 set -e
 
-export GIT_BIN ROOT_FOLDER COMMIT_CHANGES MAVEN_PATH MAVEN_EXEC REPO_NAME SPRING_CLOUD_STATIC_REPO SPRING_CLOUD_STATIC_REPO_DESTINATION
-export CURRENT_BRANCH PREVIOUS_BRANCH
-export GITHUB_REPO_USERNAME_ENV="${GITHUB_REPO_USERNAME_ENV:-GITHUB_REPO_USERNAME}"
-export GITHUB_REPO_PASSWORD_ENV="${GITHUB_REPO_PASSWORD_ENV:-GITHUB_REPO_PASSWORD}"
-REPO_USER="${!GITHUB_REPO_USERNAME_ENV}"
-REPO_PASS="${!GITHUB_REPO_PASSWORD_ENV}"
-export SPRING_CLOUD_STATIC_REPO_DESTINATION="${SPRING_CLOUD_STATIC_REPO_DESTINATION:-$( dirname "$(mktemp)")/}"
-
-GIT_BIN="${GIT_BIN:-git}"
-
-# The script should be executed from the root folder
-ROOT_FOLDER="$( pwd )"
-echo "Current folder is [${ROOT_FOLDER}]"
-echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO_DESTINATION}]"
-
 # Set default props like MAVEN_PATH, ROOT_FOLDER etc.
 function set_default_props() {
+    # The script should be executed from the root folder
+    ROOT_FOLDER=`pwd`
+    echo "Current folder is ${ROOT_FOLDER}"
+
     if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
         echo "You're not in the root folder of the project!"
         exit 1
@@ -35,8 +24,8 @@ function set_default_props() {
         MAVEN_EXEC="${MAVEN_PATH}mvn"
     fi
     echo "Path to Maven is [${MAVEN_EXEC}]"
-    if [ -z "${REPO_NAME}" ]; then
-        REPO_NAME="$("${GIT_BIN}" remote -v | grep origin | head -1 | sed -e 's!.*/!!' -e 's/ .*//' -e 's/\.git.*//')"
+    if [ -z $REPO_NAME ]; then
+        REPO_NAME=$(git remote -v | grep origin | head -1 | sed -e 's!.*/!!' -e 's/ .*//' -e 's/\.git.*//')
     fi
     echo "Repo name is [${REPO_NAME}]"
     SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
@@ -45,32 +34,22 @@ function set_default_props() {
 
 # Adds the oauth token if present to the remote url
 function add_oauth_token_to_remote_url() {
-    local remote
-    remote="$( "${GIT_BIN}" config remote.origin.url | sed -e 's/^git:/https:/' )"
+    remote=`git config remote.origin.url | sed -e 's/^git:/https:/'`
     echo "Current remote [${remote}]"
-    if [[ ${remote} != *".git" ]]; then
-        echo "Remote doesn't end with [.git]"
-        remote="${remote}.git"
-        echo "Remote with [.git] suffix: [${remote}]"
-    fi
-    if [[ "${REPO_USER}" != "" && ${remote} != *"@"* ]]; then
-        withUserAndPass=${remote/https:\/\//https://${REPO_USER}:${REPO_PASS}@}
-        echo "Username and password found. Will reuse it to push the code to [${withUserAndPass}]"
-        "${GIT_BIN}" remote set-url --push origin "${withUserAndPass}"
-    elif [[ "${RELEASER_GIT_OAUTH_TOKEN}" != "" && ${remote} != *"@"* ]]; then
+    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}@}
-        echo "OAuth token found. Will reuse it to push the code to [${withToken}]"
-        "${GIT_BIN}" remote set-url --push origin "${withToken}"
+        git remote set-url --push origin "${withToken}"
     else
-        echo "No OAuth token found. Will push to [${remote}]"
-        "${GIT_BIN}" remote set-url --push origin "${remote}"
+        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() {
     add_oauth_token_to_remote_url
-    if [[ "${RELEASE_TRAIN}" != "yes" ]] && ! ("${GIT_BIN}" remote set-branches --add origin gh-pages && "${GIT_BIN}" fetch -q) ; then
+    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
     fi
@@ -87,22 +66,19 @@ function retrieve_current_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
-      CURRENT_BRANCH=$("${GIT_BIN}" symbolic-ref -q HEAD)
+      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
       CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
       CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
     fi
     echo "Current branch is [${CURRENT_BRANCH}]"
-    "${GIT_BIN}" checkout "${CURRENT_BRANCH}" || echo "Failed to check the branch... continuing with the script"
-    PREVIOUS_BRANCH="${CURRENT_BRANCH}"
-    echo "Previous branch was [${PREVIOUS_BRANCH}]"
+    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    PREVIOUS_BRANCH=${CURRENT_BRANCH}
 }
 
 # Switches to the provided value of the release version. We always prefix it with `v`
 function switch_to_tag() {
     if [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
-        "${GIT_BIN}" checkout v"${VERSION}"
-    else
-        echo "Not switching to tag"
+        git checkout v${VERSION}
     fi
 }
 
@@ -110,19 +86,19 @@ function switch_to_tag() {
 function build_docs_if_applicable() {
     if [[ "${BUILD}" == "yes" ]] ; then
         ./mvnw clean install -P docs -pl docs -DskipTests
-    else
-       echo "Not building docs"
     fi
 }
 
 # Get the name of the `docs.main` property
 # Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
-# shellcheck disable=SC2016
 function retrieve_doc_properties() {
-    if [[ "${RELEASE_TRAIN}" == "yes" ]]; then
-        echo "Will not extract any properties for release train"
-        return 
-    fi
+    MAIN_ADOC_VALUE=$("${MAVEN_EXEC}" -q \
+        -Dexec.executable="echo" \
+        -Dexec.args='${docs.main}' \
+        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
+        -P docs \
+        -pl docs | tail -1 )
+    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
 
 
     WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
@@ -137,60 +113,47 @@ function retrieve_doc_properties() {
 
 # Stash any outstanding changes
 function stash_changes() {
-    local success="false"
-    "${GIT_BIN}" diff-index --quiet HEAD && dirty=$? && success="true"
-    if [[ "${success}" == "false" ]]; then
-        echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1"
-    fi
-    echo "The repo is dirty [${dirty}]"
-    if [ "$dirty" != "0" ]; then "${GIT_BIN}" stash; fi
+    git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
+    if [ "$dirty" != "0" ]; then git stash; fi
 }
 
 # Switch to gh-pages branch to sync it with current branch
 function add_docs_from_target() {
     local DESTINATION_REPO_FOLDER
     if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
-        DESTINATION_REPO_FOLDER="${ROOT_FOLDER}"
+        DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
     elif [[ "${CLONE}" == "yes" ]]; then
-        mkdir -p "${ROOT_FOLDER}"/target
-        local clonedStatic="${SPRING_CLOUD_STATIC_REPO_DESTINATION}"/spring-cloud-static
+        mkdir -p ${ROOT_FOLDER}/target
+        local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
         if [[ ! -e "${clonedStatic}/.git" ]]; then
-            echo "Cloning Spring Cloud Static to [${clonedStatic}]"
-            "${GIT_BIN}" clone "${SPRING_CLOUD_STATIC_REPO}" "${clonedStatic}" && cd "${clonedStatic}" && "${GIT_BIN}" checkout gh-pages
+            echo "Cloning Spring Cloud Static to target"
+            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && cd ${clonedStatic} && git checkout gh-pages
         else
-            echo "Spring Cloud Static already cloned to [${clonedStatic}] - will pull changes"
-            local pullSuccessful="false"
-            cd "${clonedStatic}" && "${GIT_BIN}" checkout gh-pages && "${GIT_BIN}" pull origin gh-pages && pullSuccessful="true" || echo "Failed to clone and pull versions - will remove the folder and clone it again"
-            if [[ "${pullSuccessful}" == "false" ]]; then
-              cd "${ROOT_FOLDER}"
-              echo "Removing the [${clonedStatic}] folder"
-              rm -rf "${clonedStatic}"
-              echo "Cloning Spring Cloud Static again"
-              "${GIT_BIN}" clone "${SPRING_CLOUD_STATIC_REPO}" "${clonedStatic}" && cd "${clonedStatic}" && "${GIT_BIN}" checkout gh-pages
-            fi
+            echo "Spring Cloud Static already cloned - will pull changes"
+            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
         fi
         if [[ -z "${RELEASE_TRAIN}" ]] ; then
-            DESTINATION_REPO_FOLDER="${clonedStatic}/${REPO_NAME}"
+            DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
         else
-            DESTINATION_REPO_FOLDER="${clonedStatic}"
+            DESTINATION_REPO_FOLDER=${clonedStatic}
         fi
-        mkdir -p "${DESTINATION_REPO_FOLDER}"
+        mkdir -p ${DESTINATION_REPO_FOLDER}
     else
         if [[ ! -e "${DESTINATION}/.git" ]]; then
             echo "[${DESTINATION}] is not a git repository"
             exit 1
         fi
         if [[ -z "${RELEASE_TRAIN}" ]] ; then
-            DESTINATION_REPO_FOLDER="${DESTINATION}/${REPO_NAME}"
+            DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
         else
-            DESTINATION_REPO_FOLDER="${DESTINATION}"
+            DESTINATION_REPO_FOLDER=${DESTINATION}
         fi
-        mkdir -p "${DESTINATION_REPO_FOLDER}"
+        mkdir -p ${DESTINATION_REPO_FOLDER}
         echo "Destination was provided [${DESTINATION}]"
     fi
-    cd "${DESTINATION_REPO_FOLDER}"
-    "${GIT_BIN}" checkout gh-pages
-    "${GIT_BIN}" pull origin gh-pages
+    cd ${DESTINATION_REPO_FOLDER}
+    git checkout gh-pages
+    git pull origin gh-pages
 
     # Add git branches
     ###################################################################
@@ -209,27 +172,33 @@ function copy_docs_for_current_version() {
         echo -e "Current branch is master - will copy the current docs only to the root folder"
         for f in docs/target/generated-docs/*; do
             file=${f#docs/target/generated-docs/*}
-            if ! "${GIT_BIN}" ls-files -i -o --exclude-standard --directory | grep -q ^"${file}"$; then
+            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
                 # Not ignored...
-                cp -rf "${f}" "${ROOT_FOLDER}"/
+                cp -rf $f ${ROOT_FOLDER}/
             fi
         done
-        "${GIT_BIN}" add -A "${ROOT_FOLDER}"
+        git add -A ${ROOT_FOLDER}
         COMMIT_CHANGES="yes"
     else
         echo -e "Current branch is [${CURRENT_BRANCH}]"
         # 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}"
+            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
             echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
             for f in docs/target/generated-docs/*; do
-                file="${f#docs/target/generated-docs/*}"
-                if ! "${GIT_BIN}" ls-files -i -o --exclude-standard --directory | grep -q ^"${file}"$; then
-                    echo "The file [${file}] shouldn't be ignored"
+                file=${f#docs/target/generated-docs/*}
+                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
                     # Not ignored...
                     # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
-                     cp -rf "${f}" "${ROOT_FOLDER}/${CURRENT_BRANCH}"
-                        "${GIT_BIN}" add -A "${ROOT_FOLDER}/${CURRENT_BRANCH}/${file}" || echo "Failed to add the file [${file}]"
+                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
+                        # We don't want to copy the spring-cloud-sleuth.html
+                        # we want it to be converted to index.html
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                    else
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file || echo "Failed to add the file [$file]"
+                    fi
                 fi
             done
             COMMIT_CHANGES="yes"
@@ -242,12 +211,12 @@ function copy_docs_for_current_version() {
 
 # Copies the docs by using the explicitly provided version
 function copy_docs_for_provided_version() {
-    local FOLDER="${DESTINATION_REPO_FOLDER}/${VERSION}"
-    mkdir -p "${FOLDER}"
+    local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
+    mkdir -p ${FOLDER}
     echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
-    for f in "${ROOT_FOLDER}"/docs/target/generated-docs/*; do
-        file="${f#${ROOT_FOLDER}/docs/target/generated-docs/*}"
-        copy_docs_for_branch "${file}" "${FOLDER}"
+    for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
+        file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
+        copy_docs_for_branch ${file} ${FOLDER}
     done
     COMMIT_CHANGES="yes"
     CURRENT_BRANCH="v${VERSION}"
@@ -258,20 +227,26 @@ function copy_docs_for_provided_version() {
 # $1 - file from target
 # $2 - destination to which copy the files
 function copy_docs_for_branch() {
-    local file="$1"
-    local destination="$2"
-    echo "Copying file [${file}] to destination [${destination}]"
-    if ! "${GIT_BIN}" ls-files -i -o --exclude-standard --directory | grep -q ^"${file}"$; then
+    local file=$1
+    local destination=$2
+    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
         # Not ignored...
-        cp -rf "${f}" "${destination}"
-        "${GIT_BIN}" add -A "${destination}"
+        # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+        if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
+            # We don't want to copy the spring-cloud-sleuth.html
+            # we want it to be converted to index.html
+            cp -rf $f ${destination}/index.html
+        else
+            cp -rf $f ${destination}
+        fi
+        git add -A ${destination}
     fi
 }
 
 function commit_changes_if_applicable() {
     if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
         COMMIT_SUCCESSFUL="no"
-        "${GIT_BIN}" commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
+        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
 
         # Uncomment the following push if you want to auto push to
         # the gh-pages branch whenever you commit to master locally.
@@ -279,7 +254,7 @@ function commit_changes_if_applicable() {
         ###################################################################
         if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
             add_oauth_token_to_remote_url
-            "${GIT_BIN}" push origin gh-pages
+            git push origin gh-pages
         fi
     fi
 }
@@ -287,10 +262,10 @@ function commit_changes_if_applicable() {
 # Switch back to the previous branch and exit block
 function checkout_previous_branch() {
     # If -version was provided we need to come back to root project
-    cd "${ROOT_FOLDER}"
-    "${GIT_BIN}" checkout "${PREVIOUS_BRANCH}" || echo "Failed to check the branch... continuing with the script"
-    if [ "$dirty" != "0" ]; then "${GIT_BIN}" stash pop; fi
-    return 0
+    cd ${ROOT_FOLDER}
+    git checkout ${PREVIOUS_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    if [ "$dirty" != "0" ]; then git stash pop; fi
+    exit 0
 }
 
 # Assert if properties have been properly passed
@@ -315,11 +290,11 @@ the script will work in the following manner:
 - if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
     with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to [docs/<project-name>/<version>]
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
 - if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to [docs/<project-name>/<version>]
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
 - if the release train switch is passed (-r) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to [docs/<version>]
+    switch to gh-pages of that repo and copy the generated docs to `docs/<version>`
 
 USAGE:
 
@@ -347,58 +322,53 @@ EOF
 #
 # ==========================================
 
+while [[ $# > 0 ]]
+do
+key="$1"
+case ${key} in
+    -v|--version)
+    VERSION="$2"
+    shift # past argument
+    ;;
+    -r|--releasetrain)
+    RELEASE_TRAIN="yes"
+    ;;
+    -d|--destination)
+    DESTINATION="$2"
+    shift # past argument
+    ;;
+    -b|--build)
+    BUILD="yes"
+    ;;
+    -c|--clone)
+    CLONE="yes"
+    ;;
+    -h|--help)
+    print_usage
+    exit 0
+    ;;
+    *)
+    echo "Invalid option: [$1]"
+    print_usage
+    exit 1
+    ;;
+esac
+shift # past argument or value
+done
 
-if [[ "${SOURCE_FUNCTIONS}" == "true" ]]; then
-    echo "Will just source functions. Will not run any commands"
+assert_properties
+set_default_props
+check_if_anything_to_sync
+retrieve_current_branch
+if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then
+    CLONE=""
+    VERSION=""
+    echo "You've provided a version variable but it's a snapshot one. Due to this will not clone spring-cloud-static and publish docs over there"
 else
-    while [[ $# -gt 0 ]]
-    do
-    key="$1"
-    case "${key}" in
-        -v|--version)
-        VERSION="$2"
-        shift # past argument
-        ;;
-        -r|--releasetrain)
-        RELEASE_TRAIN="yes"
-        ;;
-        -d|--destination)
-        DESTINATION="$2"
-        shift # past argument
-        ;;
-        -b|--build)
-        BUILD="yes"
-        ;;
-        -c|--clone)
-        CLONE="yes"
-        ;;
-        -h|--help)
-        print_usage
-        exit 0
-        ;;
-        *)
-        echo "Invalid option: [$1]"
-        print_usage
-        exit 1
-        ;;
-    esac
-    shift # past argument or value
-    done
-
-    assert_properties
-    set_default_props
-    check_if_anything_to_sync
-    retrieve_current_branch
-    if echo "${VERSION}" | grep -q -E 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then
-        CLONE=""
-        VERSION=""
-        echo "You've provided a version variable but it's a snapshot one. Due to this will not clone spring-cloud-static and publish docs over there"
-    else
-        switch_to_tag
-    fi
-    build_docs_if_applicable
-    retrieve_doc_properties
-    stash_changes
-    add_docs_from_target
-    checkout_previous_branch
+    switch_to_tag
 fi
+build_docs_if_applicable
+retrieve_doc_properties
+stash_changes
+add_docs_from_target
+checkout_previous_branch

docs/src/main/asciidoc/index.adoc

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

docs/src/main/asciidoc/update-guides.sh

@@ -1,149 +0,0 @@
-#!/bin/bash
-
-set -e
-
-GIT_BIN="${GIT_BIN:-git}"
-
-echo "Project version is [${PROJECT_VERSION}]"
-if [[ "${PROJECT_VERSION}" != *"RELEASE"* ]];then
-    echo "Will not update guides, since the version is not a RELEASE one"
-    exit 0
-fi
-
-# The script should be executed from the root folder
-[[ -z "${ROOT_FOLDER}" ]] && ROOT_FOLDER="$( pwd )"
-echo "Current folder is ${ROOT_FOLDER}"
-
-if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
-    echo "You're not in the root folder of the project!"
-    exit 1
-fi
-
-GUIDES_FOLDER="${ROOT_FOLDER}/guides"
-SPRING_GUIDES_REPO_ROOT="${SPRING_GUIDES_REPO_ROOT:-git@github.com:spring-guides}"
-echo "The Spring Guides repo root is [${SPRING_GUIDES_REPO_ROOT}]"
-
-if [[ ! -d "${GUIDES_FOLDER}" ]]; then
-  echo "No [guides] folder is present. Won't do anything"
-  exit 0
-fi
-
-function iterate_over_guides() {
-    for dir in "${GUIDES_FOLDER}"/*/     # list directories in the form "/tmp/dirname/"
-    do
-        local dir="${dir%*/}"      # remove the trailing "/"
-        local folderName="${dir##*/}"    # print everything after the final "/"
-        if [[ "${folderName}" == "target" ]]; then
-            echo "Skipping [${folderName}]"
-            continue
-        fi
-        local guideRepo="${SPRING_GUIDES_REPO_ROOT}/${folderName}"
-        local clonedGuideFolderParent="${ROOT_FOLDER}/target"
-        local clonedGuideFolder="${clonedGuideFolderParent}/${folderName}"
-        echo "Will clone [${guideRepo}] project [${folderName}] to target"
-        mkdir -p "${clonedGuideFolder}"
-        rm -rf "${clonedGuideFolder}"
-        "${GIT_BIN}" clone "${guideRepo}" "${clonedGuideFolder}"
-        pushd "${clonedGuideFolder}"
-            echo "Will start the commit process for [${folderName}]"
-            add_oauth_token_to_remote_url
-            remove_all_files
-            copy_new_guide "${GUIDES_FOLDER}/${folderName}" "${clonedGuideFolderParent}"
-            commit_and_push_new_guide_contents
-            echo "Successfully copied and pushed new guides for [${guideRepo}]"
-        popd
-    done
-}
-
-function commit_and_push_new_guide_contents() {
-    "${GIT_BIN}" add .
-    "${GIT_BIN}" commit -m "Updating guides" || echo "Nothing to commit"
-    "${GIT_BIN}" push origin master || echo "Nothing to push"
-}
-
-function copy_new_guide() {
-    local guideFolder="${1}"
-    local clonedGuideFolder="${2}"
-    echo "Will copy new guide files from [${guideFolder}/] to [${clonedGuideFolder}]"
-    cp -r "${guideFolder}/" "${clonedGuideFolder}/"
-    echo "Copied new guide files"
-}
-
-function remove_all_files() {
-    echo "Removing all non git files in [$( pwd )]"
-    "${GIT_BIN}" rm -rf "$( pwd )/"
-    "${GIT_BIN}" clean -fxd
-    echo "All files removed"
-}
-
-# Adds the oauth token if present to the remote url
-function add_oauth_token_to_remote_url() {
-    local remote
-    remote="$( "${GIT_BIN}" 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_BIN}" remote set-url --push origin "${withToken}"
-    else
-        echo "No OAuth token found"
-        "${GIT_BIN}" remote set-url --push origin "$( "${GIT_BIN}" config remote.origin.url | sed -e 's/^git:/https:/' )"
-    fi
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to keep the Spring guides up to date by taking the
-contents of guides from the project's repository and pushing them to Spring guides
-repository.
-
-This script iterates over the contents of the [guides] folder. Each its subfolder
-corresponds to a repository under the Spring Guides repository (i.e. the https://github.com/spring-guides organization).
-
-Upon the iteration a corresponding guide repository gets cloned and updated with the latest content from the project repository. A commit and push then takes place.
-
-USAGE:
-
-You can use the following options:
-
--h|--help           - display this message
-
-EOF
-}
-
-
-# ==========================================
-#    ____   ____ _____  _____ _____ _______
-#  / ____|/ ____|  __ \|_   _|  __ \__   __|
-# | (___ | |    | |__) | | | | |__) | | |
-#  \___ \| |    |  _  /  | | |  ___/  | |
-#  ____) | |____| | \ \ _| |_| |      | |
-# |_____/ \_____|_|  \_\_____|_|      |_|
-#
-# ==========================================
-
-
-if [[ "${SOURCE_FUNCTIONS}" == "true" ]]; then
-    echo "Will just source functions. Will not run any commands"
-else
-    while [[ $# -gt 0 ]]
-    do
-    key="$1"
-    case "${key}" in
-        -h|--help)
-        print_usage
-        exit 0
-        ;;
-        *)
-        echo "Invalid option: [$1]"
-        print_usage
-        exit 1
-        ;;
-    esac
-    shift # past argument or value
-    done
-
-    iterate_over_guides
-fi
-

docs/src/main/bash/sync_ghpages.sh

@@ -0,0 +1,211 @@
+#!/bin/bash
+
+set -e
+
+# Either clones or pulls the repo for given project
+# Params:
+# $1 organization e.g. spring-cloud
+# $2 repo name e.g. spring-cloud-sleuth
+function clone_or_pull() {
+    if [ "$#" -ne 2 ]
+    then
+      echo "You haven't provided 2 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth"
+      exit 1
+    fi
+    if [[ "${JUST_PUSH}" == "yes" ]] ; then
+        echo "Skipping cloning since the option to just push was provided"
+        exit 0
+    fi
+    local ORGANIZATION=$1
+    local REPO_NAME=$2
+    local LOCALREPO_VC_DIR=${REPO_NAME}/.git
+    if [ ! -d ${LOCALREPO_VC_DIR} ]
+    then
+        echo "Repo [${REPO_NAME}] doesn't exist - will clone it!"
+        git clone git@github.com:${ORGANIZATION}/${REPO_NAME}.git
+    else
+        echo "Repo [${REPO_NAME}] exists - will pull the changes"
+        cd ${REPO_NAME} && git pull || echo "Not pulling since repo is up to date"
+        cd ${ROOT_FOLDER}
+    fi
+}
+
+# For the given branch updates the docs/src/main/asciidoc/ghpages.sh
+# with the one from spring-cloud-build. Then commits and pushes the change
+# Params:
+# $1 repo name e.g. spring-cloud-sleuth
+# $2 branch name
+function update_ghpages_script() {
+    if [ "$#" -ne 2 ]
+    then
+      echo "You haven't provided 2 args... \$1 repo name e.g. spring-cloud-sleuth; \$2 branch name e.g. master"
+      exit 1
+    fi
+    local REPO_NAME=$1
+    local BRANCH_NAME=$2
+    echo "Updating ghpages script for [${REPO_NAME}] and branch [${BRANCH_NAME}]"
+    cd  ${REPO_NAME}
+    echo "Checking out [${BRANCH_NAME}]"
+    git checkout ${BRANCH_NAME}
+    echo "Resetting the repo and pulling before commiting"
+    git reset --hard origin/${BRANCH_NAME} && git pull origin ${BRANCH_NAME}
+    # If the user wants to just push we will not copy / add / commit files
+    if [[ "${JUST_PUSH}" != "yes" ]] ; then
+        echo "Copying [${GHPAGES_DOWNLOAD_PATH}] to [${GHPAGES_IN_REPO_PATH}]"
+        cp -rf ${GHPAGES_DOWNLOAD_PATH} ${GHPAGES_IN_REPO_PATH}
+        echo "Adding and committing [${GHPAGES_IN_REPO_PATH}] with message [${COMMIT_MESSAGE}]"
+        git add ${GHPAGES_IN_REPO_PATH}
+        git commit -m "${COMMIT_MESSAGE}" || echo "Proceeding to the next repo"
+    fi
+    if [[ "${AUTO_PUSH}" == "yes" ]] ; then
+        echo "Pushing the branch [${BRANCH_NAME}]"
+        wait_if_manual_proceed
+        git push origin ${BRANCH_NAME}
+    fi
+    cd ${ROOT_FOLDER}
+}
+
+# Downloads ghpages.sh
+function download_ghpages() {
+    rm -rf ${GHPAGES_DOWNLOAD_PATH}
+    echo "Downloading ghpages.sh from [${GHPAGES_URL}] to [${GHPAGES_DOWNLOAD_PATH}]"
+    curl ${GHPAGES_URL} -o ${GHPAGES_DOWNLOAD_PATH}
+    chmod +x ${GHPAGES_DOWNLOAD_PATH}
+}
+
+# Either clones or pulls the repo for given project and then updates gh-pages for the given project
+# Params:
+# $1 organization e.g. spring-cloud
+# $2 repo name e.g. spring-cloud-sleuth
+# $3 branch name e.g. master
+function clone_and_update_ghpages() {
+    if [ "$#" -ne 3 ]
+    then
+      echo "You haven't provided 3 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth; \$3 branch name e.g. master"
+      exit 1
+    fi
+    local ORGANIZATION=$1
+    local REPO_NAME=$2
+    local BRANCH_NAME=$3
+    local VAR
+    echo -e "\n\nWill clone the repo and update scripts for org [${ORGANIZATION}], repo [${REPO_NAME}] and branch [${BRANCH_NAME}]\n\n"
+    clone_or_pull ${ORGANIZATION} ${REPO_NAME}
+    update_ghpages_script ${REPO_NAME} ${BRANCH_NAME}
+    echo "Proceeding to next project"
+    wait_if_manual_proceed
+}
+
+function wait_if_manual_proceed() {
+    if [[ "${AUTO_PROCEED}" != "yes" ]] ; then
+        echo -n "Press [ENTER] to continue..."
+        read VAR
+    fi
+}
+
+# Prints the provided parameters
+function print_parameters() {
+cat <<EOF
+Running the script with the following parameters
+GHPAGES_URL=${GHPAGES_URL}
+GHPAGES_DOWNLOAD_PATH=${GHPAGES_DOWNLOAD_PATH}
+COMMIT_MESSAGE=${COMMIT_MESSAGE}
+GHPAGES_IN_REPO_PATH=${GHPAGES_IN_REPO_PATH}
+AUTO_PROCEED=${AUTO_PROCEED}
+AUTO_PUSH=${AUTO_PUSH}
+JUST_PUSH=${JUST_PUSH}
+ROOT_FOLDER=${ROOT_FOLDER}
+EOF
+}
+
+# Prints the usage
+function print_usage() {
+cat <<EOF
+The idea of this script is to batch update all ghpages scripts for all projects that we have in Spring Cloud.
+If you don't provide any options by default the script will copy the latest ghpages.sh, commit it for each repo
+and then push it to the appropriate branch.
+
+USAGE:
+
+You can use the following options:
+
+-p|--nopush         - the script will not push the changes
+-m|--manualproceed  - if you want to do a manual proceed after every step
+-x|--justpush       - if you want to go to every single repo and just push the changes
+-h|--help           - present this help message
+
+EOF
+}
+
+# ==========================================
+#    ____   ____ _____  _____ _____ _______
+#  / ____|/ ____|  __ \|_   _|  __ \__   __|
+# | (___ | |    | |__) | | | | |__) | | |
+#  \___ \| |    |  _  /  | | |  ___/  | |
+#  ____) | |____| | \ \ _| |_| |      | |
+# |_____/ \_____|_|  \_\_____|_|      |_|
+#
+# ==========================================
+
+while [[ $# > 0 ]]
+do
+key="$1"
+case ${key} in
+    -p|--nopush)
+    AUTO_PUSH="no"
+    ;;
+    -m|--manualproceed)
+    AUTO_PROCEED="no"
+    ;;
+    -x|--justpush)
+    JUST_PUSH="yes"
+    ;;
+    -h|--help)
+    print_usage
+    exit 0
+    ;;
+    *)
+    echo "Invalid option: [$1]"
+    print_usage
+    exit 1
+    ;;
+esac
+shift # past argument or value
+done
+
+export GHPAGES_URL=${GHPAGES_URL:-https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/ghpages.sh}
+export GHPAGES_DOWNLOAD_PATH=${GHPAGES_DOWNLOAD_PATH:-/tmp/ghpages.sh}
+export COMMIT_MESSAGE=${COMMIT_MESSAGE:-Updating ghpages for all projects}
+export GHPAGES_IN_REPO_PATH=${GHPAGES_IN_REPO_PATH:-docs/src/main/asciidoc/ghpages.sh}
+export AUTO_PROCEED=${AUTO_PROCEED:-yes}
+export AUTO_PUSH=${AUTO_PUSH:-yes}
+export JUST_PUSH=${JUST_PUSH:-no}
+export ROOT_FOLDER=`pwd`
+
+
+print_parameters
+download_ghpages
+clone_and_update_ghpages spring-cloud spring-cloud-aws master
+clone_and_update_ghpages spring-cloud spring-cloud-aws 1.0.x
+clone_and_update_ghpages spring-cloud spring-cloud-aws 1.2.x
+clone_and_update_ghpages spring-cloud spring-cloud-bus master
+clone_and_update_ghpages spring-cloud spring-cloud-cli 1.0.x
+clone_and_update_ghpages spring-cloud spring-cloud-cli 1.1.x
+clone_and_update_ghpages spring-cloud spring-cloud-cli master
+clone_and_update_ghpages spring-cloud spring-cloud-cloudfoundry master
+clone_and_update_ghpages spring-cloud spring-cloud-cluster master
+clone_and_update_ghpages spring-cloud spring-cloud-commons master
+clone_and_update_ghpages spring-cloud spring-cloud-config master
+clone_and_update_ghpages spring-cloud spring-cloud-config 1.1.x
+clone_and_update_ghpages spring-cloud spring-cloud-consul 1.0.x
+clone_and_update_ghpages spring-cloud spring-cloud-consul master
+clone_and_update_ghpages spring-cloud spring-cloud-contract master
+clone_and_update_ghpages spring-cloud spring-cloud-netflix 1.0.x
+clone_and_update_ghpages spring-cloud spring-cloud-netflix 1.1.x
+clone_and_update_ghpages spring-cloud spring-cloud-netflix master
+clone_and_update_ghpages spring-cloud spring-cloud-security master
+clone_and_update_ghpages spring-cloud spring-cloud-sleuth 1.0.x
+clone_and_update_ghpages spring-cloud spring-cloud-sleuth master
+clone_and_update_ghpages spring-cloud spring-cloud-starters Brixton
+clone_and_update_ghpages spring-cloud spring-cloud-starters master
+clone_and_update_ghpages spring-cloud-incubator spring-cloud-vault-config master
+clone_and_update_ghpages spring-cloud spring-cloud-zookeeper master

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

@@ -0,0 +1,35 @@
+/* 
+   code highlight CSS resemblign the Eclipse IDE default color schema
+   @author Costin Leau
+*/
+
+.hl-keyword {
+    color: #7F0055;
+    font-weight: bold;
+}
+
+.hl-comment {
+    color: #3F5F5F;
+    font-style: italic;
+}
+
+.hl-multiline-comment {
+    color: #3F5FBF;
+    font-style: italic;
+}
+
+.hl-tag {
+    color: #3F7F7F;
+}
+
+.hl-attribute {
+    color: #7F007F;
+}
+
+.hl-value {
+    color: #2A00FF;
+}
+
+.hl-string {
+    color: #2A00FF;
+}

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

@@ -0,0 +1,9 @@
+@IMPORT url("manual.css");
+
+body.firstpage {
+    background: url("../images/background.png") no-repeat center top;
+}
+
+div.part h1 {
+    border-top: none;
+}

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

@@ -0,0 +1,6 @@
+@IMPORT url("manual.css");
+
+body {
+    background: url("../images/background.png") no-repeat center top;
+}
+

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

@@ -0,0 +1,342 @@
+@IMPORT url("highlight.css");
+
+html {
+    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;
+}
+
+code {
+    font-size: 16px;
+    font-family: Consolas, "Liberation Mono", Courier, monospace;
+}
+
+: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;
+}
+
+body > *:first-child {
+    margin-top: 0 !important;
+}
+
+div {
+    margin: 0pt;
+}
+
+hr {
+    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 {
+    margin: 40px 0 10px;
+}
+
+h1 {
+    margin: 70px 0 30px;
+    padding-top: 20px;
+}
+
+div.part h1 {
+    border-top: 1px dotted #CCCCCC;
+}
+
+h1, h1 code {
+    font-size: 32px;
+}
+
+h2, h2 code {
+    font-size: 24px;
+}
+
+h3, h3 code {
+    font-size: 20px;
+}
+
+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;
+}
+
+p.releaseinfo {
+    font-weight: bold;
+    margin-bottom: 40px;
+    margin-top: 40px;
+}
+
+div.authorgroup {
+    line-height: 1;
+}
+
+p.copyright {
+    line-height: 1;
+    margin-bottom: -5px;
+}
+
+.legalnotice p {
+    font-style: italic;
+    font-size: 14px;
+    line-height: 1;
+}
+
+div.titlepage + p, div.titlepage + p {
+    margin-top: 0;
+}
+
+pre {
+    line-height: 1.0;
+    color: black;
+}
+
+a {
+    color: #4183C4;
+    text-decoration: none;
+}
+
+p {
+    margin: 15px 0;
+    text-align: left;
+}
+
+ul, ol {
+    padding-left: 30px;
+}
+
+li p {
+    margin: 0;
+}
+
+div.table {
+    margin: 1em;
+    padding: 0.5em;
+    text-align: center;
+}
+
+div.table table, div.informaltable table {
+    display: table;
+    width: 100%;
+}
+
+div.table td {
+    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;
+}
+
+.sidebar p.title {
+    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;
+}
+
+table {
+    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;
+}
+
+table tr {
+    border: none;
+    border-bottom: none;
+}
+
+table th {
+    font-weight: bold;
+}
+
+table th, table td {
+    border: none !important;
+    padding: 6px 13px;
+}
+
+table tr:nth-child(2n) {
+    background-color: #F8F8F8;
+}
+
+td p {
+    margin: 0 0 15px 0;
+}
+
+div.table-contents td p {
+    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 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 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 > 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.toc {
+    line-height: 1.2;
+}
+
+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 > 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;
+}
+
+tbody.footnotes * {
+    border: none !important;
+}
+
+div.footnote p {
+    margin: 0;
+    line-height: 1;
+}
+
+div.footnote p sup {
+    margin-right: 6px;
+    vertical-align: middle;
+}
+
+div.navheader {
+    border-bottom: 1px solid #CCCCCC;
+}
+
+div.navfooter {
+    border-top: 1px solid #CCCCCC;
+}
+
+.title {
+    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:before {
+    content: "\00A7";
+}
+
+.title:hover > a, .title > a:hover, .title:hover > a:hover {
+    visibility: visible;
+}
+
+.title:focus > a, .title > a:focus, .title:focus > a:focus {
+    outline: 0;
+}

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ 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
+
+   https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				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>
+	<xsl:param name="tablecolumns.extension">0</xsl:param>
+	<xsl:param name="callout.extensions">1</xsl:param>
+
+	<!-- Graphics -->
+	<xsl:param name="admon.graphics" select="1"/>
+	<xsl:param name="admon.graphics.path">images/</xsl:param>
+	<xsl:param name="admon.graphics.extension">.png</xsl:param>
+
+	<!-- Table of Contents -->
+	<xsl:param name="generate.toc">book toc,title</xsl:param>
+	<xsl:param name="toc.section.depth">3</xsl:param>
+
+	<!-- Hide revhistory -->
+	<xsl:template match="d:revhistory" mode="titlepage.mode"/>
+
+</xsl:stylesheet>

docs/src/main/docbook/xsl/epub.xsl

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+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
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				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"/>
+
+</xsl:stylesheet>

docs/src/main/docbook/xsl/html-multipage.xsl

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+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
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="html.xsl"/>
+
+	<xsl:param name="html.stylesheet">css/manual-multipage.css</xsl:param>
+
+	<xsl:param name="chunk.section.depth">'5'</xsl:param>
+	<xsl:param name="use.id.as.filename">'1'</xsl:param>
+
+	<!-- Replace chunk-element-content from chunk-common to add firstpage class to body -->
+	<xsl:template name="chunk-element-content">
+		<xsl:param name="prev"/>
+		<xsl:param name="next"/>
+		<xsl:param name="nav.context"/>
+		<xsl:param name="content">
+			<xsl:apply-imports/>
+		</xsl:param>
+
+		<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:call-template>
+			<body>
+				<xsl:if test="count($prev) = 0">
+					<xsl:attribute name="class">firstpage</xsl:attribute>
+				</xsl:if>
+				<xsl:call-template name="body.attributes"/>
+				<xsl:call-template name="user.header.navigation"/>
+				<xsl:call-template name="header.navigation">
+					<xsl:with-param name="prev" select="$prev"/>
+					<xsl:with-param name="next" select="$next"/>
+					<xsl:with-param name="nav.context" select="$nav.context"/>
+				</xsl:call-template>
+				<xsl:call-template name="user.header.content"/>
+				<xsl:copy-of select="$content"/>
+				<xsl:call-template name="user.footer.content"/>
+				<xsl:call-template name="footer.navigation">
+					<xsl:with-param name="prev" select="$prev"/>
+					<xsl:with-param name="next" select="$next"/>
+					<xsl:with-param name="nav.context" select="$nav.context"/>
+				</xsl:call-template>
+				<xsl:call-template name="user.footer.navigation"/>
+			</body>
+		</html>
+		<xsl:value-of select="$chunk.append"/>
+	</xsl:template>
+</xsl:stylesheet>

docs/src/main/docbook/xsl/html-singlepage.xsl

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+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
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="html.xsl"/>
+
+	<xsl:param name="html.stylesheet">css/manual-singlepage.css</xsl:param>
+
+</xsl:stylesheet>

docs/src/main/docbook/xsl/html.xsl

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+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
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+				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"/>
+
+	<!-- Only use scaling in FO -->
+	<xsl:param name="ignore.image.scaling">1</xsl:param>
+
+	<!-- Use code syntax highlighting -->
+	<xsl:param name="highlight.source">1</xsl:param>
+
+	<!-- Activate Graphics -->
+	<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>
+
+	<xsl:param name="table.borders.with.css" select="1"/>
+	<xsl:param name="html.stylesheet.type">text/css</xsl:param>
+
+	<xsl:param name="admonition.title.properties">text-align: left</xsl:param>
+
+	<!-- Leave image paths as relative when navigating XInclude -->
+	<xsl:param name="keep.relative.image.uris" select="1"/>
+
+	<!-- Label Chapters and Sections (numbering) -->
+	<xsl:param name="chapter.autolabel" select="1"/>
+	<xsl:param name="section.autolabel" select="1"/>
+	<xsl:param name="section.autolabel.max.depth" select="2"/>
+	<xsl:param name="section.label.includes.component.label" select="1"/>
+	<xsl:param name="table.footnote.number.format" select="'1'"/>
+
+	<!-- Remove "Chapter" from the Chapter titles... -->
+	<xsl:param name="local.l10n.xml" select="document('')"/>
+	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+		<l:l10n language="en">
+			<l:context name="title-numbered">
+				<l:template name="chapter" text="%n.&#160;%t"/>
+				<l:template name="section" text="%n&#160;%t"/>
+			</l:context>
+		</l:l10n>
+	</l:i18n>
+
+	<!-- Syntax Highlighting -->
+	<xsl:template match='xslthl:keyword' mode="xslthl">
+		<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>
+	</xsl:template>
+
+	<xsl:template match='xslthl:oneline-comment' mode="xslthl">
+		<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>
+	</xsl:template>
+
+	<xsl:template match='xslthl:tag' mode="xslthl">
+		<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>
+	</xsl:template>
+
+	<xsl:template match='xslthl:value' mode="xslthl">
+		<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>
+	</xsl:template>
+
+	<!-- Custom Title Page -->
+	<xsl:template match="d:author" mode="titlepage.mode">
+		<xsl:if test="name(preceding-sibling::*[1]) = 'author'">
+			<xsl:text>, </xsl:text>
+		</xsl:if>
+		<span class="{name(.)}">
+			<xsl:call-template name="person.name"/>
+			<xsl:apply-templates mode="titlepage.mode" select="./contrib"/>
+		</span>
+	</xsl:template>
+	<xsl:template match="d:authorgroup" mode="titlepage.mode">
+		<div class="{name(.)}">
+			<h2>Authors</h2>
+			<xsl:apply-templates mode="titlepage.mode"/>
+		</div>
+	</xsl:template>
+
+	<!-- Title Links -->
+	<xsl:template name="anchor">
+		<xsl:param name="node" select="."/>
+		<xsl:param name="conditional" select="1"/>
+		<xsl:variable name="id">
+			<xsl:call-template name="object.id">
+				<xsl:with-param name="object" select="$node"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
+			<xsl:element name="a">
+				<xsl:attribute name="name">
+					<xsl:value-of select="$id"/>
+				</xsl:attribute>
+				<xsl:attribute name="href">
+					<xsl:text>#</xsl:text>
+					<xsl:value-of select="$id"/>
+				</xsl:attribute>
+			</xsl:element>
+		</xsl:if>
+	</xsl:template>
+
+</xsl:stylesheet>

docs/src/main/docbook/xsl/pdf.xsl

@@ -0,0 +1,611 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+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
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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.sourceforge.net/"
+				xmlns:xlink='http://www.w3.org/1999/xlink'
+				xmlns:exsl="http://exslt.org/common"
+				exclude-result-prefixes="exsl xslthl d xlink"
+				version='1.0'>
+
+	<xsl:import href="urn:docbkx:stylesheet"/>
+	<xsl:import href="urn:docbkx:stylesheet/highlight.xsl"/>
+	<xsl:import href="common.xsl"/>
+
+	<!-- Extensions -->
+	<xsl:param name="fop1.extensions" select="1"/>
+
+	<xsl:param name="paper.type" select="'A4'"/>
+	<xsl:param name="page.margin.top" select="'1cm'"/>
+	<xsl:param name="region.before.extent" select="'1cm'"/>
+	<xsl:param name="body.margin.top" select="'1.5cm'"/>
+
+	<xsl:param name="body.margin.bottom" select="'1.5cm'"/>
+	<xsl:param name="region.after.extent" select="'1cm'"/>
+	<xsl:param name="page.margin.bottom" select="'1cm'"/>
+	<xsl:param name="title.margin.left" select="'0cm'"/>
+
+	<!-- allow break across pages -->
+	<xsl:attribute-set name="formal.object.properties">
+		<xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- use color links and sensible rendering -->
+	<xsl:attribute-set name="xref.properties">
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		<xsl:attribute name="color">#204060</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:param name="ulink.show" select="0"></xsl:param>
+	<xsl:param name="ulink.footnotes" select="0"></xsl:param>
+
+	<!-- TITLE PAGE -->
+
+	<xsl:template name="book.titlepage.recto">
+		<fo:block>
+			<fo:table table-layout="fixed" width="175mm">
+				<fo:table-column column-width="175mm"/>
+				<fo:table-body>
+					<fo:table-row>
+						<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"
+								/>
+							</fo:block>
+							<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">
+								<xsl:value-of select="d:info/d:subtitle"/>
+							</fo:block>
+							<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">
+								<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">
+								<xsl:for-each select="d:info/d:authorgroup/d:author">
+									<xsl:if test="position() > 1">
+										<xsl:text>, </xsl:text>
+									</xsl:if>
+									<xsl:value-of select="."/>
+								</xsl:for-each>
+							</fo:block>
+
+							<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>
+
+							<fo:block font-family="Helvetica" font-size="8pt"
+									  padding="1mm">
+								<xsl:value-of select="d:info/d:legalnotice"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template>
+
+	<!-- Prevent blank pages in output -->
+	<xsl:template name="book.titlepage.before.verso">
+	</xsl:template>
+	<xsl:template name="book.titlepage.verso">
+	</xsl:template>
+	<xsl:template name="book.titlepage.separator">
+	</xsl:template>
+
+	<!--  HEADER -->
+
+	<!-- More space in the center header for long text -->
+	<xsl:attribute-set name="header.content.properties">
+		<xsl:attribute name="font-family">
+			<xsl:value-of select="$body.font.family"/>
+		</xsl:attribute>
+		<xsl:attribute name="margin-left">-5em</xsl:attribute>
+		<xsl:attribute name="margin-right">-5em</xsl:attribute>
+		<xsl:attribute name="font-size">8pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="header.content">
+		<xsl:param name="pageclass" select="''"/>
+		<xsl:param name="sequence" select="''"/>
+		<xsl:param name="position" select="''"/>
+		<xsl:param name="gentext-key" select="''"/>
+
+		<xsl:variable name="Version">
+			<xsl:choose>
+				<xsl:when test="//d:title">
+					<xsl:value-of select="//d:title"/><xsl:text> </xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>please define title in your docbook file!</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$sequence='blank'">
+				<xsl:choose>
+					<xsl:when test="$position='center'">
+						<xsl:value-of select="$Version"/>
+					</xsl:when>
+
+					<xsl:otherwise>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+
+			<xsl:when test="$pageclass='titlepage'">
+			</xsl:when>
+
+			<xsl:when test="$position='center'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:otherwise>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<!-- FOOTER-->
+	<xsl:attribute-set name="footer.content.properties">
+		<xsl:attribute name="font-family">
+			<xsl:value-of select="$body.font.family"/>
+		</xsl:attribute>
+		<xsl:attribute name="font-size">8pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="footer.content">
+		<xsl:param name="pageclass" select="''"/>
+		<xsl:param name="sequence" select="''"/>
+		<xsl:param name="position" select="''"/>
+		<xsl:param name="gentext-key" select="''"/>
+
+		<xsl:variable name="Version">
+			<xsl:choose>
+				<xsl:when test="//d:releaseinfo">
+					<xsl:value-of select="//d:releaseinfo"/>
+				</xsl:when>
+				<xsl:otherwise>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:variable name="Title">
+			<xsl:choose>
+				<xsl:when test="//d:productname">
+					<xsl:value-of select="//d:productname"/><xsl:text> </xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>please define title in your docbook file!</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:choose>
+			<xsl:when test="$sequence='blank'">
+				<xsl:choose>
+					<xsl:when test="$double.sided != 0 and $position = 'left'">
+						<xsl:value-of select="$Version"/>
+					</xsl:when>
+
+					<xsl:when test="$double.sided = 0 and $position = 'center'">
+					</xsl:when>
+
+					<xsl:otherwise>
+						<fo:page-number/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+
+			<xsl:when test="$pageclass='titlepage'">
+			</xsl:when>
+
+			<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'">
+				<fo:page-number/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided = 0 and $position='right'">
+				<fo:page-number/>
+			</xsl:when>
+
+			<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:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:when test="$double.sided = 0 and $position='left'">
+				<xsl:value-of select="$Version"/>
+			</xsl:when>
+
+			<xsl:when test="$position='center'">
+				<xsl:value-of select="$Title"/>
+			</xsl:when>
+
+			<xsl:otherwise>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="processing-instruction('hard-pagebreak')">
+		<fo:block break-before='page'/>
+	</xsl:template>
+
+
+	<!-- PAPER & PAGE SIZE -->
+
+	<!-- Paper type, no headers on blank pages, no double sided printing -->
+	<xsl:param name="double.sided">0</xsl:param>
+	<xsl:param name="headers.on.blank.pages">0</xsl:param>
+	<xsl:param name="footers.on.blank.pages">0</xsl:param>
+
+	<!-- FONTS & STYLES -->
+
+	<xsl:param name="hyphenate">false</xsl:param>
+
+	<!-- Default Font size -->
+	<xsl:param name="body.font.family">Helvetica</xsl:param>
+	<xsl:param name="body.font.master">10</xsl:param>
+	<xsl:param name="body.font.small">8</xsl:param>
+	<xsl:param name="title.font.family">Helvetica</xsl:param>
+
+	<!-- Line height in body text -->
+	<xsl:param name="line-height">1.4</xsl:param>
+
+	<!-- Chapter title size -->
+	<xsl:attribute-set name="chapter.titlepage.recto.style">
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.8"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Why is the font-size for chapters hardcoded in the XSL FO templates?
+	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:call-template name="component.title">
+				<xsl:with-param name="node" select="ancestor-or-self::d:chapter[1]"/>
+			</xsl:call-template>
+		</fo:block>
+	</xsl:template>
+
+	<!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
+	<xsl:attribute-set name="section.title.level1.properties">
+		<xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.6em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.5"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level2.properties">
+		<xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.25"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level3.properties">
+		<xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 1.0"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="section.title.level4.properties">
+		<xsl:attribute name="space-before.optimum">0.3em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.3em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.3em</xsl:attribute>
+		<xsl:attribute name="font-size">
+			<xsl:value-of select="$body.font.master * 0.9"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+
+	<!-- TABLES -->
+
+	<!-- Some padding inside tables -->
+	<xsl:attribute-set name="table.cell.padding">
+		<xsl:attribute name="padding-left">4pt</xsl:attribute>
+		<xsl:attribute name="padding-right">4pt</xsl:attribute>
+		<xsl:attribute name="padding-top">4pt</xsl:attribute>
+		<xsl:attribute name="padding-bottom">4pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Only hairlines as frame and cell borders in tables -->
+	<xsl:param name="table.frame.border.thickness">0.1pt</xsl:param>
+	<xsl:param name="table.cell.border.thickness">0.1pt</xsl:param>
+
+	<!-- LABELS -->
+
+	<!-- Label Chapters and Sections (numbering) -->
+	<xsl:param name="chapter.autolabel" select="1"/>
+	<xsl:param name="section.autolabel" select="1"/>
+	<xsl:param name="section.autolabel.max.depth" select="1"/>
+
+	<xsl:param name="section.label.includes.component.label" select="1"/>
+	<xsl:param name="table.footnote.number.format" select="'1'"/>
+
+	<!-- PROGRAMLISTINGS -->
+
+	<!-- Verbatim text formatting (programlistings) -->
+	<xsl:attribute-set name="monospace.verbatim.properties">
+		<xsl:attribute name="font-size">7pt</xsl:attribute>
+		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+		<xsl:attribute name="keep-together.within-column">1</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="verbatim.properties">
+		<xsl:attribute name="space-before.minimum">1em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+
+		<xsl:attribute name="border-color">#444444</xsl:attribute>
+		<xsl:attribute name="border-style">solid</xsl:attribute>
+		<xsl:attribute name="border-width">0.1pt</xsl:attribute>
+		<xsl:attribute name="padding-top">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-left">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-right">0.5em</xsl:attribute>
+		<xsl:attribute name="padding-bottom">0.5em</xsl:attribute>
+		<xsl:attribute name="margin-left">0.5em</xsl:attribute>
+		<xsl:attribute name="margin-right">0.5em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Shade (background) programlistings -->
+	<xsl:param name="shade.verbatim">1</xsl:param>
+	<xsl:attribute-set name="shade.verbatim.style">
+		<xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="list.block.spacing">
+		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="example.properties">
+		<xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.5em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="sidebar.properties">
+		<xsl:attribute name="border-color">#444444</xsl:attribute>
+		<xsl:attribute name="border-style">solid</xsl:attribute>
+		<xsl:attribute name="border-width">0.1pt</xsl:attribute>
+		<xsl:attribute name="background-color">#F0F0F0</xsl:attribute>
+	</xsl:attribute-set>
+
+
+	<!-- TITLE INFORMATION FOR FIGURES, EXAMPLES ETC. -->
+
+	<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">
+			<xsl:value-of select="$body.font.master"/>
+			<xsl:text>pt</xsl:text>
+		</xsl:attribute>
+		<xsl:attribute name="hyphenate">false</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0.1em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- CALLOUTS -->
+
+	<!-- don't use images for callouts -->
+	<xsl:param name="callout.graphics">0</xsl:param>
+	<xsl:param name="callout.unicode">1</xsl:param>
+
+	<!-- Place callout marks at this column in annotated areas -->
+	<xsl:param name="callout.defaultcolumn">90</xsl:param>
+
+	<!-- MISC -->
+
+	<!-- Placement of titles -->
+	<xsl:param name="formal.title.placement">
+		figure after
+		example after
+		equation before
+		table before
+		procedure before
+	</xsl:param>
+
+	<!-- Format Variable Lists as Blocks (prevents horizontal overflow) -->
+	<xsl:param name="variablelist.as.blocks">1</xsl:param>
+	<xsl:param name="body.start.indent">0pt</xsl:param>
+
+	<!-- Remove "Chapter" from the Chapter titles... -->
+	<xsl:param name="local.l10n.xml" select="document('')"/>
+	<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+		<l:l10n language="en">
+			<l:context name="title-numbered">
+				<l:template name="chapter" text="%n.&#160;%t"/>
+				<l:template name="section" text="%n&#160;%t"/>
+			</l:context>
+			<l:context name="title">
+				<l:template name="example" text="Example&#160;%n&#160;%t"/>
+			</l:context>
+		</l:l10n>
+	</l:i18n>
+
+	<!-- admon -->
+	<xsl:param name="admon.graphics" select="0"/>
+
+	<xsl:attribute-set name="nongraphical.admonition.properties">
+		<xsl:attribute name="margin-left">0.1em</xsl:attribute>
+		<xsl:attribute name="margin-right">2em</xsl:attribute>
+		<xsl:attribute name="border-left-width">.75pt</xsl:attribute>
+		<xsl:attribute name="border-left-style">solid</xsl:attribute>
+		<xsl:attribute name="border-left-color">#5c5c4f</xsl:attribute>
+		<xsl:attribute name="padding-left">0.5em</xsl:attribute>
+		<xsl:attribute name="space-before.optimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.optimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.minimum">1.5em</xsl:attribute>
+		<xsl:attribute name="space-after.maximum">1.5em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<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>
+		<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+		<xsl:attribute name="margin-left">0</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="admonition.properties">
+		<xsl:attribute name="space-before.optimum">0em</xsl:attribute>
+		<xsl:attribute name="space-before.minimum">0em</xsl:attribute>
+		<xsl:attribute name="space-before.maximum">0em</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Asciidoc -->
+	<xsl:template match="processing-instruction('asciidoc-br')">
+		<fo:block/>
+	</xsl:template>
+
+	<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:block>
+	</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>
+	</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>
+	</xsl:template>
+
+	<xsl:template match='xslthl:comment' mode="xslthl">
+		<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>
+	</xsl:template>
+
+	<xsl:template match='xslthl:attribute' mode="xslthl">
+		<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>
+	</xsl:template>
+
+</xsl:stylesheet>

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

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

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+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>
+</highlighters>

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

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SH
+
+xslthl - XSLT Syntax Highlighting
+https://sourceforge.net/projects/xslthl/
+Copyright (C) 2010 Mathieu Malaterre
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<quote>'</quote>
+		<quote>"</quote>
+		<flag>-</flag>
+		<noWhiteSpace/>
+		<looseTerminator/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- reserved words -->
+		<keyword>if</keyword>
+		<keyword>then</keyword>
+		<keyword>else</keyword>
+		<keyword>elif</keyword>
+		<keyword>fi</keyword>
+		<keyword>case</keyword>
+		<keyword>esac</keyword>
+		<keyword>for</keyword>
+		<keyword>while</keyword>
+		<keyword>until</keyword>
+		<keyword>do</keyword>
+		<keyword>done</keyword>
+		<!-- built-ins -->
+		<keyword>exec</keyword>
+		<keyword>shift</keyword>
+		<keyword>exit</keyword>
+		<keyword>times</keyword>
+		<keyword>break</keyword>
+		<keyword>export</keyword>
+		<keyword>trap</keyword>
+		<keyword>continue</keyword>
+		<keyword>readonly</keyword>
+		<keyword>wait</keyword>
+		<keyword>eval</keyword>
+		<keyword>return</keyword>
+		<!-- other commands -->
+		<keyword>cd</keyword>
+		<keyword>echo</keyword>
+		<keyword>hash</keyword>
+		<keyword>pwd</keyword>
+		<keyword>read</keyword>
+		<keyword>set</keyword>
+		<keyword>test</keyword>
+		<keyword>type</keyword>
+		<keyword>ulimit</keyword>
+		<keyword>umask</keyword>
+		<keyword>unset</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Syntax highlighting definition for C
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- use the online-comment highlighter to detect directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>auto</keyword>
+		<keyword>_Bool</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>char</keyword>
+		<keyword>_Complex</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>extern</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>_Imaginary</keyword>
+		<keyword>inline</keyword>
+		<keyword>int</keyword>
+		<keyword>long</keyword>
+		<keyword>register</keyword>
+		<keyword>restrict</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>signed</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>static</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>typedef</keyword>
+		<keyword>union</keyword>
+		<keyword>unsigned</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for C++
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- use the online-comment highlighter to detect directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- C keywords -->
+		<keyword>auto</keyword>
+		<keyword>_Bool</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>char</keyword>
+		<keyword>_Complex</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>extern</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>_Imaginary</keyword>
+		<keyword>inline</keyword>
+		<keyword>int</keyword>
+		<keyword>long</keyword>
+		<keyword>register</keyword>
+		<keyword>restrict</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>signed</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>static</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>typedef</keyword>
+		<keyword>union</keyword>
+		<keyword>unsigned</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+		<!-- C++ keywords -->
+		<keyword>asm</keyword>
+		<keyword>dynamic_cast</keyword>
+		<keyword>namespace</keyword>
+		<keyword>reinterpret_cast</keyword>
+		<keyword>try</keyword>
+		<keyword>bool</keyword>
+		<keyword>explicit</keyword>
+		<keyword>new</keyword>
+		<keyword>static_cast</keyword>
+		<keyword>typeid</keyword>
+		<keyword>catch</keyword>
+		<keyword>false</keyword>
+		<keyword>operator</keyword>
+		<keyword>template</keyword>
+		<keyword>typename</keyword>
+		<keyword>class</keyword>
+		<keyword>friend</keyword>
+		<keyword>private</keyword>
+		<keyword>this</keyword>
+		<keyword>using</keyword>
+		<keyword>const_cast</keyword>
+		<keyword>inline</keyword>
+		<keyword>public</keyword>
+		<keyword>throw</keyword>
+		<keyword>virtual</keyword>
+		<keyword>delete</keyword>
+		<keyword>mutable</keyword>
+		<keyword>protected</keyword>
+		<keyword>true</keyword>
+		<keyword>wchar_t</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for C#
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start>///</start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="annotation">
+		<!-- annotations are called (custom) "attributes" in .NET -->
+		<start>[</start>
+		<end>]</end>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<!-- C# supports a couple of directives -->
+		<start>#</start>
+		<lineBreakEscape>\</lineBreakEscape>
+		<style>directive</style>
+		<solitary/>
+	</highlighter>
+	<highlighter type="string">
+		<!-- strings starting with an "@" can span multiple lines -->
+		<string>@"</string>
+		<endString>"</endString>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<exponent>e</exponent>
+		<suffix>ul</suffix>
+		<suffix>lu</suffix>
+		<suffix>u</suffix>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>m</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>abstract</keyword>
+		<keyword>as</keyword>
+		<keyword>base</keyword>
+		<keyword>bool</keyword>
+		<keyword>break</keyword>
+		<keyword>byte</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>char</keyword>
+		<keyword>checked</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>decimal</keyword>
+		<keyword>default</keyword>
+		<keyword>delegate</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>enum</keyword>
+		<keyword>event</keyword>
+		<keyword>explicit</keyword>
+		<keyword>extern</keyword>
+		<keyword>false</keyword>
+		<keyword>finally</keyword>
+		<keyword>fixed</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>foreach</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>implicit</keyword>
+		<keyword>in</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>internal</keyword>
+		<keyword>is</keyword>
+		<keyword>lock</keyword>
+		<keyword>long</keyword>
+		<keyword>namespace</keyword>
+		<keyword>new</keyword>
+		<keyword>null</keyword>
+		<keyword>object</keyword>
+		<keyword>operator</keyword>
+		<keyword>out</keyword>
+		<keyword>override</keyword>
+		<keyword>params</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>readonly</keyword>
+		<keyword>ref</keyword>
+		<keyword>return</keyword>
+		<keyword>sbyte</keyword>
+		<keyword>sealed</keyword>
+		<keyword>short</keyword>
+		<keyword>sizeof</keyword>
+		<keyword>stackalloc</keyword>
+		<keyword>static</keyword>
+		<keyword>string</keyword>
+		<keyword>struct</keyword>
+		<keyword>switch</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>true</keyword>
+		<keyword>try</keyword>
+		<keyword>typeof</keyword>
+		<keyword>uint</keyword>
+		<keyword>ulong</keyword>
+		<keyword>unchecked</keyword>
+		<keyword>unsafe</keyword>
+		<keyword>ushort</keyword>
+		<keyword>using</keyword>
+		<keyword>virtual</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+	<highlighter type="keywords">
+		<!-- special words, not really keywords -->
+		<keyword>add</keyword>
+		<keyword>alias</keyword>
+		<keyword>from</keyword>
+		<keyword>get</keyword>
+		<keyword>global</keyword>
+		<keyword>group</keyword>
+		<keyword>into</keyword>
+		<keyword>join</keyword>
+		<keyword>orderby</keyword>
+		<keyword>partial</keyword>
+		<keyword>remove</keyword>
+		<keyword>select</keyword>
+		<keyword>set</keyword>
+		<keyword>value</keyword>
+		<keyword>where</keyword>
+		<keyword>yield</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for CSS files
+
+xslthl - XSLT Syntax Highlighting
+https://sourceforge.net/projects/xslthl/
+Copyright (C) 2011-2012 Martin Hujer, Michiel Hendriks
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Martin Hujer <mhujer at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+Reference: https://www.w3.org/TR/CSS21/propidx.html
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</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>
+</highlighters>

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

@@ -0,0 +1,122 @@
+<?xml version='1.0'?>
+<!--
+
+  Bakalarska prace: Zvyraznovani syntaxe v XSLT
+  Michal Molhanec 2005
+
+  myxml-hl.xml - konfigurace zvyraznovace XML, ktera zvlast zvyrazni
+                 HTML elementy a XSL elementy
+
+  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>
+</highlighters>

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for ini files
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">;</highlighter>
+	<highlighter type="regex">
+		<!-- ini sections -->
+		<pattern>^(\[.+\]\s*)$</pattern>
+		<style>keyword</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<!-- the keys in an ini section -->
+		<pattern>^(.+)(?==)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Java
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>abstract</keyword>
+		<keyword>boolean</keyword>
+		<keyword>break</keyword>
+		<keyword>byte</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>char</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>do</keyword>
+		<keyword>double</keyword>
+		<keyword>else</keyword>
+		<keyword>extends</keyword>
+		<keyword>final</keyword>
+		<keyword>finally</keyword>
+		<keyword>float</keyword>
+		<keyword>for</keyword>
+		<keyword>goto</keyword>
+		<keyword>if</keyword>
+		<keyword>implements</keyword>
+		<keyword>import</keyword>
+		<keyword>instanceof</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>long</keyword>
+		<keyword>native</keyword>
+		<keyword>new</keyword>
+		<keyword>package</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>return</keyword>
+		<keyword>short</keyword>
+		<keyword>static</keyword>
+		<keyword>strictfp</keyword>
+		<keyword>super</keyword>
+		<keyword>switch</keyword>
+		<keyword>synchronized</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>throws</keyword>
+		<keyword>transient</keyword>
+		<keyword>try</keyword>
+		<keyword>void</keyword>
+		<keyword>volatile</keyword>
+		<keyword>while</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for JavaScript
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>catch</keyword>
+		<keyword>continue</keyword>
+		<keyword>default</keyword>
+		<keyword>delete</keyword>
+		<keyword>do</keyword>
+		<keyword>else</keyword>
+		<keyword>finally</keyword>
+		<keyword>for</keyword>
+		<keyword>function</keyword>
+		<keyword>if</keyword>
+		<keyword>in</keyword>
+		<keyword>instanceof</keyword>
+		<keyword>new</keyword>
+		<keyword>return</keyword>
+		<keyword>switch</keyword>
+		<keyword>this</keyword>
+		<keyword>throw</keyword>
+		<keyword>try</keyword>
+		<keyword>typeof</keyword>
+		<keyword>var</keyword>
+		<keyword>void</keyword>
+		<keyword>while</keyword>
+		<keyword>with</keyword>
+		<!-- future keywords -->
+		<keyword>abstract</keyword>
+		<keyword>boolean</keyword>
+		<keyword>byte</keyword>
+		<keyword>char</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>debugger</keyword>
+		<keyword>double</keyword>
+		<keyword>enum</keyword>
+		<keyword>export</keyword>
+		<keyword>extends</keyword>
+		<keyword>final</keyword>
+		<keyword>float</keyword>
+		<keyword>goto</keyword>
+		<keyword>implements</keyword>
+		<keyword>import</keyword>
+		<keyword>int</keyword>
+		<keyword>interface</keyword>
+		<keyword>long</keyword>
+		<keyword>native</keyword>
+		<keyword>package</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>public</keyword>
+		<keyword>short</keyword>
+		<keyword>static</keyword>
+		<keyword>super</keyword>
+		<keyword>synchronized</keyword>
+		<keyword>throws</keyword>
+		<keyword>transient</keyword>
+		<keyword>volatile</keyword>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>prototype</keyword>
+		<!-- Global Objects -->
+		<keyword>Array</keyword>
+		<keyword>Boolean</keyword>
+		<keyword>Date</keyword>
+		<keyword>Error</keyword>
+		<keyword>EvalError</keyword>
+		<keyword>Function</keyword>
+		<keyword>Math</keyword>
+		<keyword>Number</keyword>
+		<keyword>Object</keyword>
+		<keyword>RangeError</keyword>
+		<keyword>ReferenceError</keyword>
+		<keyword>RegExp</keyword>
+		<keyword>String</keyword>
+		<keyword>SyntaxError</keyword>
+		<keyword>TypeError</keyword>
+		<keyword>URIError</keyword>
+		<!-- Global functions -->
+		<keyword>decodeURI</keyword>
+		<keyword>decodeURIComponent</keyword>
+		<keyword>encodeURI</keyword>
+		<keyword>encodeURIComponent</keyword>
+		<keyword>eval</keyword>
+		<keyword>isFinite</keyword>
+		<keyword>isNaN</keyword>
+		<keyword>parseFloat</keyword>
+		<keyword>parseInt</keyword>
+		<!-- Global properties -->
+		<keyword>Infinity</keyword>
+		<keyword>NaN</keyword>
+		<keyword>undefined</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Perl
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<quote>'</quote>
+		<quote>"</quote>
+		<noWhiteSpace/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>if</keyword>
+		<keyword>unless</keyword>
+		<keyword>while</keyword>
+		<keyword>until</keyword>
+		<keyword>foreach</keyword>
+		<keyword>else</keyword>
+		<keyword>elsif</keyword>
+		<keyword>for</keyword>
+		<keyword>when</keyword>
+		<keyword>default</keyword>
+		<keyword>given</keyword>
+		<!-- Keywords related to the control flow of your perl program  -->
+		<keyword>caller</keyword>
+		<keyword>continue</keyword>
+		<keyword>die</keyword>
+		<keyword>do</keyword>
+		<keyword>dump</keyword>
+		<keyword>eval</keyword>
+		<keyword>exit</keyword>
+		<keyword>goto</keyword>
+		<keyword>last</keyword>
+		<keyword>next</keyword>
+		<keyword>redo</keyword>
+		<keyword>return</keyword>
+		<keyword>sub</keyword>
+		<keyword>wantarray</keyword>
+		<!-- Keywords related to scoping  -->
+		<keyword>caller</keyword>
+		<keyword>import</keyword>
+		<keyword>local</keyword>
+		<keyword>my</keyword>
+		<keyword>package</keyword>
+		<keyword>use</keyword>
+		<!-- Keywords related to perl modules  -->
+		<keyword>do</keyword>
+		<keyword>import</keyword>
+		<keyword>no</keyword>
+		<keyword>package</keyword>
+		<keyword>require</keyword>
+		<keyword>use</keyword>
+		<!-- Keywords related to classes and object-orientedness  -->
+		<keyword>bless</keyword>
+		<keyword>dbmclose</keyword>
+		<keyword>dbmopen</keyword>
+		<keyword>package</keyword>
+		<keyword>ref</keyword>
+		<keyword>tie</keyword>
+		<keyword>tied</keyword>
+		<keyword>untie</keyword>
+		<keyword>use</keyword>
+		<!-- operators -->
+		<keyword>and</keyword>
+		<keyword>or</keyword>
+		<keyword>not</keyword>
+		<keyword>eq</keyword>
+		<keyword>ne</keyword>
+		<keyword>lt</keyword>
+		<keyword>gt</keyword>
+		<keyword>le</keyword>
+		<keyword>ge</keyword>
+		<keyword>cmp</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for PHP
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="multiline-comment">
+		<start>/**</start>
+		<end>*/</end>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="oneline-comment">
+		<start><![CDATA[/// ]]></start>
+		<style>doccomment</style>
+	</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="oneline-comment">//</highlighter>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;&lt;</start>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>and</keyword>
+		<keyword>or</keyword>
+		<keyword>xor</keyword>
+		<keyword>__FILE__</keyword>
+		<keyword>exception</keyword>
+		<keyword>__LINE__</keyword>
+		<keyword>array</keyword>
+		<keyword>as</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>class</keyword>
+		<keyword>const</keyword>
+		<keyword>continue</keyword>
+		<keyword>declare</keyword>
+		<keyword>default</keyword>
+		<keyword>die</keyword>
+		<keyword>do</keyword>
+		<keyword>echo</keyword>
+		<keyword>else</keyword>
+		<keyword>elseif</keyword>
+		<keyword>empty</keyword>
+		<keyword>enddeclare</keyword>
+		<keyword>endfor</keyword>
+		<keyword>endforeach</keyword>
+		<keyword>endif</keyword>
+		<keyword>endswitch</keyword>
+		<keyword>endwhile</keyword>
+		<keyword>eval</keyword>
+		<keyword>exit</keyword>
+		<keyword>extends</keyword>
+		<keyword>for</keyword>
+		<keyword>foreach</keyword>
+		<keyword>function</keyword>
+		<keyword>global</keyword>
+		<keyword>if</keyword>
+		<keyword>include</keyword>
+		<keyword>include_once</keyword>
+		<keyword>isset</keyword>
+		<keyword>list</keyword>
+		<keyword>new</keyword>
+		<keyword>print</keyword>
+		<keyword>require</keyword>
+		<keyword>require_once</keyword>
+		<keyword>return</keyword>
+		<keyword>static</keyword>
+		<keyword>switch</keyword>
+		<keyword>unset</keyword>
+		<keyword>use</keyword>
+		<keyword>var</keyword>
+		<keyword>while</keyword>
+		<keyword>__FUNCTION__</keyword>
+		<keyword>__CLASS__</keyword>
+		<keyword>__METHOD__</keyword>
+		<keyword>final</keyword>
+		<keyword>php_user_filter</keyword>
+		<keyword>interface</keyword>
+		<keyword>implements</keyword>
+		<keyword>extends</keyword>
+		<keyword>public</keyword>
+		<keyword>private</keyword>
+		<keyword>protected</keyword>
+		<keyword>abstract</keyword>
+		<keyword>clone</keyword>
+		<keyword>try</keyword>
+		<keyword>catch</keyword>
+		<keyword>throw</keyword>
+		<keyword>cfunction</keyword>
+		<keyword>old_function</keyword>
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+		<!-- PHP 5.3 -->
+		<keyword>namespace</keyword>
+		<keyword>__NAMESPACE__</keyword>
+		<keyword>goto</keyword>
+		<keyword>__DIR__</keyword>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="word">
+		<!-- highlight the php open and close tags as directives -->
+		<word>?&gt;</word>
+		<word>&lt;?php</word>
+		<word>&lt;?=</word>
+		<style>directive</style>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Java
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="regex">
+		<pattern>^(.+?)(?==|:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Python
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="annotation">
+		<!-- these are actually called decorators -->
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"""</string>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="string">
+		<string>'''</string>
+		<spanNewLines/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<exponent>e</exponent>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>and</keyword>
+		<keyword>del</keyword>
+		<keyword>from</keyword>
+		<keyword>not</keyword>
+		<keyword>while</keyword>
+		<keyword>as</keyword>
+		<keyword>elif</keyword>
+		<keyword>global</keyword>
+		<keyword>or</keyword>
+		<keyword>with</keyword>
+		<keyword>assert</keyword>
+		<keyword>else</keyword>
+		<keyword>if</keyword>
+		<keyword>pass</keyword>
+		<keyword>yield</keyword>
+		<keyword>break</keyword>
+		<keyword>except</keyword>
+		<keyword>import</keyword>
+		<keyword>print</keyword>
+		<keyword>class</keyword>
+		<keyword>exec</keyword>
+		<keyword>in</keyword>
+		<keyword>raise</keyword>
+		<keyword>continue</keyword>
+		<keyword>finally</keyword>
+		<keyword>is</keyword>
+		<keyword>return</keyword>
+		<keyword>def</keyword>
+		<keyword>for</keyword>
+		<keyword>lambda</keyword>
+		<keyword>try</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Syntax highlighting definition for Ruby
+
+xslthl - XSLT Syntax Highlighting
+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
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+Michal Molhanec <mol1111 at users.sourceforge.net>
+Jirka Kosek <kosek at users.sourceforge.net>
+Michiel Hendriks <elmuerte at users.sourceforge.net>
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="heredoc">
+		<start>&lt;&lt;</start>
+		<noWhiteSpace/>
+	</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%Q{</string>
+		<endString>}</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%/</string>
+		<endString>/</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>%q{</string>
+		<endString>}</endString>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="hexnumber">
+		<prefix>0x</prefix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>alias</keyword>
+		<keyword>and</keyword>
+		<keyword>BEGIN</keyword>
+		<keyword>begin</keyword>
+		<keyword>break</keyword>
+		<keyword>case</keyword>
+		<keyword>class</keyword>
+		<keyword>def</keyword>
+		<keyword>defined</keyword>
+		<keyword>do</keyword>
+		<keyword>else</keyword>
+		<keyword>elsif</keyword>
+		<keyword>END</keyword>
+		<keyword>end</keyword>
+		<keyword>ensure</keyword>
+		<keyword>false</keyword>
+		<keyword>for</keyword>
+		<keyword>if</keyword>
+		<keyword>in</keyword>
+		<keyword>module</keyword>
+		<keyword>next</keyword>
+		<keyword>nil</keyword>
+		<keyword>not</keyword>
+		<keyword>or</keyword>
+		<keyword>redo</keyword>
+		<keyword>rescue</keyword>
+		<keyword>retry</keyword>
+		<keyword>return</keyword>
+		<keyword>self</keyword>
+		<keyword>super</keyword>
+		<keyword>then</keyword>
+		<keyword>true</keyword>
+		<keyword>undef</keyword>
+		<keyword>unless</keyword>
+		<keyword>until</keyword>
+		<keyword>when</keyword>
+		<keyword>while</keyword>
+		<keyword>yield</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Syntax highlighting definition for SQL:1999
+
+xslthl - XSLT Syntax Highlighting
+https://sourceforge.net/projects/xslthl/
+Copyright (C) 2012 Michiel Hendriks, Martin Hujer, k42b3
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+-->
+<highlighters>
+	<highlighter type="oneline-comment">--</highlighter>
+	<highlighter type="multiline-comment">
+		<start>/*</start>
+		<end>*/</end>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<doubleEscapes/>
+	</highlighter>
+	<highlighter type="string">
+		<string>U'</string>
+		<endString>'</endString>
+		<doubleEscapes/>
+	</highlighter>
+	<highlighter type="string">
+		<string>B'</string>
+		<endString>'</endString>
+		<doubleEscapes/>
+	</highlighter>
+	<highlighter type="string">
+		<string>N'</string>
+		<endString>'</endString>
+		<doubleEscapes/>
+	</highlighter>
+	<highlighter type="string">
+		<string>X'</string>
+		<endString>'</endString>
+		<doubleEscapes/>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<pointStarts/>
+		<exponent>e</exponent>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<ignoreCase/>
+		<!-- reserved -->
+		<keyword>A</keyword>
+		<keyword>ABS</keyword>
+		<keyword>ABSOLUTE</keyword>
+		<keyword>ACTION</keyword>
+		<keyword>ADA</keyword>
+		<keyword>ADMIN</keyword>
+		<keyword>AFTER</keyword>
+		<keyword>ALWAYS</keyword>
+		<keyword>ASC</keyword>
+		<keyword>ASSERTION</keyword>
+		<keyword>ASSIGNMENT</keyword>
+		<keyword>ATTRIBUTE</keyword>
+		<keyword>ATTRIBUTES</keyword>
+		<keyword>AVG</keyword>
+		<keyword>BEFORE</keyword>
+		<keyword>BERNOULLI</keyword>
+		<keyword>BREADTH</keyword>
+		<keyword>C</keyword>
+		<keyword>CARDINALITY</keyword>
+		<keyword>CASCADE</keyword>
+		<keyword>CATALOG_NAME</keyword>
+		<keyword>CATALOG</keyword>
+		<keyword>CEIL</keyword>
+		<keyword>CEILING</keyword>
+		<keyword>CHAIN</keyword>
+		<keyword>CHAR_LENGTH</keyword>
+		<keyword>CHARACTER_LENGTH</keyword>
+		<keyword>CHARACTER_SET_CATALOG</keyword>
+		<keyword>CHARACTER_SET_NAME</keyword>
+		<keyword>CHARACTER_SET_SCHEMA</keyword>
+		<keyword>CHARACTERISTICS</keyword>
+		<keyword>CHARACTERS</keyword>
+		<keyword>CHECKED</keyword>
+		<keyword>CLASS_ORIGIN</keyword>
+		<keyword>COALESCE</keyword>
+		<keyword>COBOL</keyword>
+		<keyword>CODE_UNITS</keyword>
+		<keyword>COLLATION_CATALOG</keyword>
+		<keyword>COLLATION_NAME</keyword>
+		<keyword>COLLATION_SCHEMA</keyword>
+		<keyword>COLLATION</keyword>
+		<keyword>COLLECT</keyword>
+		<keyword>COLUMN_NAME</keyword>
+		<keyword>COMMAND_FUNCTION_CODE</keyword>
+		<keyword>COMMAND_FUNCTION</keyword>
+		<keyword>COMMITTED</keyword>
+		<keyword>CONDITION_NUMBER</keyword>
+		<keyword>CONDITION</keyword>
+		<keyword>CONNECTION_NAME</keyword>
+		<keyword>CONSTRAINT_CATALOG</keyword>
+		<keyword>CONSTRAINT_NAME</keyword>
+		<keyword>CONSTRAINT_SCHEMA</keyword>
+		<keyword>CONSTRAINTS</keyword>
+		<keyword>CONSTRUCTORS</keyword>
+		<keyword>CONTAINS</keyword>
+		<keyword>CONVERT</keyword>
+		<keyword>CORR</keyword>
+		<keyword>COUNT</keyword>
+		<keyword>COVAR_POP</keyword>
+		<keyword>COVAR_SAMP</keyword>
+		<keyword>CUME_DIST</keyword>
+		<keyword>CURRENT_COLLATION</keyword>
+		<keyword>CURSOR_NAME</keyword>
+		<keyword>DATA</keyword>
+		<keyword>DATETIME_INTERVAL_CODE</keyword>
+		<keyword>DATETIME_INTERVAL_PRECISION</keyword>
+		<keyword>DEFAULTS</keyword>
+		<keyword>DEFERRABLE</keyword>
+		<keyword>DEFERRED</keyword>
+		<keyword>DEFINED</keyword>
+		<keyword>DEFINER</keyword>
+		<keyword>DEGREE</keyword>
+		<keyword>DENSE_RANK</keyword>
+		<keyword>DEPTH</keyword>
+		<keyword>DERIVED</keyword>
+		<keyword>DESC</keyword>
+		<keyword>DESCRIPTOR</keyword>
+		<keyword>DIAGNOSTICS</keyword>
+		<keyword>DISPATCH</keyword>
+		<keyword>DOMAIN</keyword>
+		<keyword>DYNAMIC_FUNCTION_CODE</keyword>
+		<keyword>DYNAMIC_FUNCTION</keyword>
+		<keyword>EQUALS</keyword>
+		<keyword>EVERY</keyword>
+		<keyword>EXCEPTION</keyword>
+		<keyword>EXCLUDE</keyword>
+		<keyword>EXCLUDING</keyword>
+		<keyword>EXP</keyword>
+		<keyword>EXTRACT</keyword>
+		<keyword>FINAL</keyword>
+		<keyword>FIRST</keyword>
+		<keyword>FLOOR</keyword>
+		<keyword>FOLLOWING</keyword>
+		<keyword>FORTRAN</keyword>
+		<keyword>FOUND</keyword>
+		<keyword>FUSION</keyword>
+		<keyword>G</keyword>
+		<keyword>GENERAL</keyword>
+		<keyword>GO</keyword>
+		<keyword>GOTO</keyword>
+		<keyword>GRANTED</keyword>
+		<keyword>HIERARCHY</keyword>
+		<keyword>IMPLEMENTATION</keyword>
+		<keyword>INCLUDING</keyword>
+		<keyword>INCREMENT</keyword>
+		<keyword>INITIALLY</keyword>
+		<keyword>INSTANCE</keyword>
+		<keyword>INSTANTIABLE</keyword>
+		<keyword>INTERSECTION</keyword>
+		<keyword>INVOKER</keyword>
+		<keyword>ISOLATION</keyword>
+		<keyword>K</keyword>
+		<keyword>KEY_MEMBER</keyword>
+		<keyword>KEY_TYPE</keyword>
+		<keyword>KEY</keyword>
+		<keyword>LAST</keyword>
+		<keyword>LENGTH</keyword>
+		<keyword>LEVEL</keyword>
+		<keyword>LN</keyword>
+		<keyword>LOCATOR</keyword>
+		<keyword>LOWER</keyword>
+		<keyword>M</keyword>
+		<keyword>MAP</keyword>
+		<keyword>MATCHED</keyword>
+		<keyword>MAX</keyword>
+		<keyword>MAXVALUE</keyword>
+		<keyword>MESSAGE_LENGTH</keyword>
+		<keyword>MESSAGE_OCTET_LENGTH</keyword>
+		<keyword>MESSAGE_TEXT</keyword>
+		<keyword>MIN</keyword>
+		<keyword>MINVALUE</keyword>
+		<keyword>MOD</keyword>
+		<keyword>MORE</keyword>
+		<keyword>MUMPS</keyword>
+		<keyword>NAME</keyword>
+		<keyword>NAMES</keyword>
+		<keyword>NESTING</keyword>
+		<keyword>NEXT</keyword>
+		<keyword>NORMALIZE</keyword>
+		<keyword>NORMALIZED</keyword>
+		<keyword>NULLABLE</keyword>
+		<keyword>NULLIF</keyword>
+		<keyword>NULLS</keyword>
+		<keyword>NUMBER</keyword>
+		<keyword>OBJECT</keyword>
+		<keyword>OCTET_LENGTH</keyword>
+		<keyword>OCTETS</keyword>
+		<keyword>OPTION</keyword>
+		<keyword>OPTIONS</keyword>
+		<keyword>ORDERING</keyword>
+		<keyword>ORDINALITY</keyword>
+		<keyword>OTHERS</keyword>
+		<keyword>OVERLAY</keyword>
+		<keyword>OVERRIDING</keyword>
+		<keyword>PAD</keyword>
+		<keyword>PARAMETER_MODE</keyword>
+		<keyword>PARAMETER_NAME</keyword>
+		<keyword>PARAMETER_ORDINAL_POSITION</keyword>
+		<keyword>PARAMETER_SPECIFIC_CATALOG</keyword>
+		<keyword>PARAMETER_SPECIFIC_NAME</keyword>
+		<keyword>PARAMETER_SPECIFIC_SCHEMA</keyword>
+		<keyword>PARTIAL</keyword>
+		<keyword>PASCAL</keyword>
+		<keyword>PATH</keyword>
+		<keyword>PERCENT_RANK</keyword>
+		<keyword>PERCENTILE_CONT</keyword>
+		<keyword>PERCENTILE_DISC</keyword>
+		<keyword>PLACING</keyword>
+		<keyword>PLI</keyword>
+		<keyword>POSITION</keyword>
+		<keyword>POWER</keyword>
+		<keyword>PRECEDING</keyword>
+		<keyword>PRESERVE</keyword>
+		<keyword>PRIOR</keyword>
+		<keyword>PRIVILEGES</keyword>
+		<keyword>PUBLIC</keyword>
+		<keyword>RANK</keyword>
+		<keyword>READ</keyword>
+		<keyword>RELATIVE</keyword>
+		<keyword>REPEATABLE</keyword>
+		<keyword>RESTART</keyword>
+		<keyword>RETURNED_CARDINALITY</keyword>
+		<keyword>RETURNED_LENGTH</keyword>
+		<keyword>RETURNED_OCTET_LENGTH</keyword>
+		<keyword>RETURNED_SQLSTATE</keyword>
+		<keyword>ROLE</keyword>
+		<keyword>ROUTINE_CATALOG</keyword>
+		<keyword>ROUTINE_NAME</keyword>
+		<keyword>ROUTINE_SCHEMA</keyword>
+		<keyword>ROUTINE</keyword>
+		<keyword>ROW_COUNT</keyword>
+		<keyword>ROW_NUMBER</keyword>
+		<keyword>SCALE</keyword>
+		<keyword>SCHEMA_NAME</keyword>
+		<keyword>SCHEMA</keyword>
+		<keyword>SCOPE_CATALOG</keyword>
+		<keyword>SCOPE_NAME</keyword>
+		<keyword>SCOPE_SCHEMA</keyword>
+		<keyword>SECTION</keyword>
+		<keyword>SECURITY</keyword>
+		<keyword>SELF</keyword>
+		<keyword>SEQUENCE</keyword>
+		<keyword>SERIALIZABLE</keyword>
+		<keyword>SERVER_NAME</keyword>
+		<keyword>SESSION</keyword>
+		<keyword>SETS</keyword>
+		<keyword>SIMPLE</keyword>
+		<keyword>SIZE</keyword>
+		<keyword>SOURCE</keyword>
+		<keyword>SPACE</keyword>
+		<keyword>SPECIFIC_NAME</keyword>
+		<keyword>SQRT</keyword>
+		<keyword>STATE</keyword>
+		<keyword>STATEMENT</keyword>
+		<keyword>STDDEV_POP</keyword>
+		<keyword>STDDEV_SAMP</keyword>
+		<keyword>STRUCTURE</keyword>
+		<keyword>STYLE</keyword>
+		<keyword>SUBCLASS_ORIGIN</keyword>
+		<keyword>SUBSTRING</keyword>
+		<keyword>SUM</keyword>
+		<keyword>TABLE_NAME</keyword>
+		<keyword>TABLESAMPLE</keyword>
+		<keyword>TEMPORARY</keyword>
+		<keyword>TIES</keyword>
+		<keyword>TOP_LEVEL_COUNT</keyword>
+		<keyword>TRANSACTION_ACTIVE</keyword>
+		<keyword>TRANSACTION</keyword>
+		<keyword>TRANSACTIONS_COMMITTED</keyword>
+		<keyword>TRANSACTIONS_ROLLED_BACK</keyword>
+		<keyword>TRANSFORM</keyword>
+		<keyword>TRANSFORMS</keyword>
+		<keyword>TRANSLATE</keyword>
+		<keyword>TRIGGER_CATALOG</keyword>
+		<keyword>TRIGGER_NAME</keyword>
+		<keyword>TRIGGER_SCHEMA</keyword>
+		<keyword>TRIM</keyword>
+		<keyword>TYPE</keyword>
+		<keyword>UNBOUNDED</keyword>
+		<keyword>UNCOMMITTED</keyword>
+		<keyword>UNDER</keyword>
+		<keyword>UNNAMED</keyword>
+		<keyword>USAGE</keyword>
+		<keyword>USER_DEFINED_TYPE_CATALOG</keyword>
+		<keyword>USER_DEFINED_TYPE_CODE</keyword>
+		<keyword>USER_DEFINED_TYPE_NAME</keyword>
+		<keyword>USER_DEFINED_TYPE_SCHEMA</keyword>
+		<keyword>VIEW</keyword>
+		<keyword>WORK</keyword>
+		<keyword>WRITE</keyword>
+		<keyword>ZONE</keyword>
+		<!-- non reserved -->
+		<keyword>ADD</keyword>
+		<keyword>ALL</keyword>
+		<keyword>ALLOCATE</keyword>
+		<keyword>ALTER</keyword>
+		<keyword>AND</keyword>
+		<keyword>ANY</keyword>
+		<keyword>ARE</keyword>
+		<keyword>ARRAY</keyword>
+		<keyword>AS</keyword>
+		<keyword>ASENSITIVE</keyword>
+		<keyword>ASYMMETRIC</keyword>
+		<keyword>AT</keyword>
+		<keyword>ATOMIC</keyword>
+		<keyword>AUTHORIZATION</keyword>
+		<keyword>BEGIN</keyword>
+		<keyword>BETWEEN</keyword>
+		<keyword>BIGINT</keyword>
+		<keyword>BINARY</keyword>
+		<keyword>BLOB</keyword>
+		<keyword>BOOLEAN</keyword>
+		<keyword>BOTH</keyword>
+		<keyword>BY</keyword>
+		<keyword>CALL</keyword>
+		<keyword>CALLED</keyword>
+		<keyword>CASCADED</keyword>
+		<keyword>CASE</keyword>
+		<keyword>CAST</keyword>
+		<keyword>CHAR</keyword>
+		<keyword>CHARACTER</keyword>
+		<keyword>CHECK</keyword>
+		<keyword>CLOB</keyword>
+		<keyword>CLOSE</keyword>
+		<keyword>COLLATE</keyword>
+		<keyword>COLUMN</keyword>
+		<keyword>COMMIT</keyword>
+		<keyword>CONNECT</keyword>
+		<keyword>CONSTRAINT</keyword>
+		<keyword>CONTINUE</keyword>
+		<keyword>CORRESPONDING</keyword>
+		<keyword>CREATE</keyword>
+		<keyword>CROSS</keyword>
+		<keyword>CUBE</keyword>
+		<keyword>CURRENT_DATE</keyword>
+		<keyword>CURRENT_DEFAULT_TRANSFORM_GROUP</keyword>
+		<keyword>CURRENT_PATH</keyword>
+		<keyword>CURRENT_ROLE</keyword>
+		<keyword>CURRENT_TIME</keyword>
+		<keyword>CURRENT_TIMESTAMP</keyword>
+		<keyword>CURRENT_TRANSFORM_GROUP_FOR_TYPE</keyword>
+		<keyword>CURRENT_USER</keyword>
+		<keyword>CURRENT</keyword>
+		<keyword>CURSOR</keyword>
+		<keyword>CYCLE</keyword>
+		<keyword>DATE</keyword>
+		<keyword>DAY</keyword>
+		<keyword>DEALLOCATE</keyword>
+		<keyword>DEC</keyword>
+		<keyword>DECIMAL</keyword>
+		<keyword>DECLARE</keyword>
+		<keyword>DEFAULT</keyword>
+		<keyword>DELETE</keyword>
+		<keyword>DEREF</keyword>
+		<keyword>DESCRIBE</keyword>
+		<keyword>DETERMINISTIC</keyword>
+		<keyword>DISCONNECT</keyword>
+		<keyword>DISTINCT</keyword>
+		<keyword>DOUBLE</keyword>
+		<keyword>DROP</keyword>
+		<keyword>DYNAMIC</keyword>
+		<keyword>EACH</keyword>
+		<keyword>ELEMENT</keyword>
+		<keyword>ELSE</keyword>
+		<keyword>END</keyword>
+		<keyword>END-EXEC</keyword>
+		<keyword>ESCAPE</keyword>
+		<keyword>EXCEPT</keyword>
+		<keyword>EXEC</keyword>
+		<keyword>EXECUTE</keyword>
+		<keyword>EXISTS</keyword>
+		<keyword>EXTERNAL</keyword>
+		<keyword>FALSE</keyword>
+		<keyword>FETCH</keyword>
+		<keyword>FILTER</keyword>
+		<keyword>FLOAT</keyword>
+		<keyword>FOR</keyword>
+		<keyword>FOREIGN</keyword>
+		<keyword>FREE</keyword>
+		<keyword>FROM</keyword>
+		<keyword>FULL</keyword>
+		<keyword>FUNCTION</keyword>
+		<keyword>GET</keyword>
+		<keyword>GLOBAL</keyword>
+		<keyword>GRANT</keyword>
+		<keyword>GROUP</keyword>
+		<keyword>GROUPING</keyword>
+		<keyword>HAVING</keyword>
+		<keyword>HOLD</keyword>
+		<keyword>HOUR</keyword>
+		<keyword>IDENTITY</keyword>
+		<keyword>IMMEDIATE</keyword>
+		<keyword>IN</keyword>
+		<keyword>INDICATOR</keyword>
+		<keyword>INNER</keyword>
+		<keyword>INOUT</keyword>
+		<keyword>INPUT</keyword>
+		<keyword>INSENSITIVE</keyword>
+		<keyword>INSERT</keyword>
+		<keyword>INT</keyword>
+		<keyword>INTEGER</keyword>
+		<keyword>INTERSECT</keyword>
+		<keyword>INTERVAL</keyword>
+		<keyword>INTO</keyword>
+		<keyword>IS</keyword>
+		<keyword>ISOLATION</keyword>
+		<keyword>JOIN</keyword>
+		<keyword>LANGUAGE</keyword>
+		<keyword>LARGE</keyword>
+		<keyword>LATERAL</keyword>
+		<keyword>LEADING</keyword>
+		<keyword>LEFT</keyword>
+		<keyword>LIKE</keyword>
+		<keyword>LOCAL</keyword>
+		<keyword>LOCALTIME</keyword>
+		<keyword>LOCALTIMESTAMP</keyword>
+		<keyword>MATCH</keyword>
+		<keyword>MEMBER</keyword>
+		<keyword>MERGE</keyword>
+		<keyword>METHOD</keyword>
+		<keyword>MINUTE</keyword>
+		<keyword>MODIFIES</keyword>
+		<keyword>MODULE</keyword>
+		<keyword>MONTH</keyword>
+		<keyword>MULTISET</keyword>
+		<keyword>NATIONAL</keyword>
+		<keyword>NATURAL</keyword>
+		<keyword>NCHAR</keyword>
+		<keyword>NCLOB</keyword>
+		<keyword>NEW</keyword>
+		<keyword>NO</keyword>
+		<keyword>NONE</keyword>
+		<keyword>NOT</keyword>
+		<keyword>NULL</keyword>
+		<keyword>NUMERIC</keyword>
+		<keyword>OF</keyword>
+		<keyword>OLD</keyword>
+		<keyword>ON</keyword>
+		<keyword>ONLY</keyword>
+		<keyword>OPEN</keyword>
+		<keyword>OR</keyword>
+		<keyword>ORDER</keyword>
+		<keyword>OUT</keyword>
+		<keyword>OUTER</keyword>
+		<keyword>OUTPUT</keyword>
+		<keyword>OVER</keyword>
+		<keyword>OVERLAPS</keyword>
+		<keyword>PARAMETER</keyword>
+		<keyword>PARTITION</keyword>
+		<keyword>PRECISION</keyword>
+		<keyword>PREPARE</keyword>
+		<keyword>PRIMARY</keyword>
+		<keyword>PROCEDURE</keyword>
+		<keyword>RANGE</keyword>
+		<keyword>READS</keyword>
+		<keyword>REAL</keyword>
+		<keyword>RECURSIVE</keyword>
+		<keyword>REF</keyword>
+		<keyword>REFERENCES</keyword>
+		<keyword>REFERENCING</keyword>
+		<keyword>REGR_AVGX</keyword>
+		<keyword>REGR_AVGY</keyword>
+		<keyword>REGR_COUNT</keyword>
+		<keyword>REGR_INTERCEPT</keyword>
+		<keyword>REGR_R2</keyword>
+		<keyword>REGR_SLOPE</keyword>
+		<keyword>REGR_SXX</keyword>
+		<keyword>REGR_SXY</keyword>
+		<keyword>REGR_SYY</keyword>
+		<keyword>RELEASE</keyword>
+		<keyword>RESULT</keyword>
+		<keyword>RETURN</keyword>
+		<keyword>RETURNS</keyword>
+		<keyword>REVOKE</keyword>
+		<keyword>RIGHT</keyword>
+		<keyword>ROLLBACK</keyword>
+		<keyword>ROLLUP</keyword>
+		<keyword>ROW</keyword>
+		<keyword>ROWS</keyword>
+		<keyword>SAVEPOINT</keyword>
+		<keyword>SCROLL</keyword>
+		<keyword>SEARCH</keyword>
+		<keyword>SECOND</keyword>
+		<keyword>SELECT</keyword>
+		<keyword>SENSITIVE</keyword>
+		<keyword>SESSION_USER</keyword>
+		<keyword>SET</keyword>
+		<keyword>SIMILAR</keyword>
+		<keyword>SMALLINT</keyword>
+		<keyword>SOME</keyword>
+		<keyword>SPECIFIC</keyword>
+		<keyword>SPECIFICTYPE</keyword>
+		<keyword>SQL</keyword>
+		<keyword>SQLEXCEPTION</keyword>
+		<keyword>SQLSTATE</keyword>
+		<keyword>SQLWARNING</keyword>
+		<keyword>START</keyword>
+		<keyword>STATIC</keyword>
+		<keyword>SUBMULTISET</keyword>
+		<keyword>SYMMETRIC</keyword>
+		<keyword>SYSTEM_USER</keyword>
+		<keyword>SYSTEM</keyword>
+		<keyword>TABLE</keyword>
+		<keyword>THEN</keyword>
+		<keyword>TIME</keyword>
+		<keyword>TIMESTAMP</keyword>
+		<keyword>TIMEZONE_HOUR</keyword>
+		<keyword>TIMEZONE_MINUTE</keyword>
+		<keyword>TO</keyword>
+		<keyword>TRAILING</keyword>
+		<keyword>TRANSLATION</keyword>
+		<keyword>TREAT</keyword>
+		<keyword>TRIGGER</keyword>
+		<keyword>TRUE</keyword>
+		<keyword>UESCAPE</keyword>
+		<keyword>UNION</keyword>
+		<keyword>UNIQUE</keyword>
+		<keyword>UNKNOWN</keyword>
+		<keyword>UNNEST</keyword>
+		<keyword>UPDATE</keyword>
+		<keyword>UPPER</keyword>
+		<keyword>USER</keyword>
+		<keyword>USING</keyword>
+		<keyword>VALUE</keyword>
+		<keyword>VALUES</keyword>
+		<keyword>VAR_POP</keyword>
+		<keyword>VAR_SAMP</keyword>
+		<keyword>VARCHAR</keyword>
+		<keyword>VARYING</keyword>
+		<keyword>WHEN</keyword>
+		<keyword>WHENEVER</keyword>
+		<keyword>WHERE</keyword>
+		<keyword>WIDTH_BUCKET</keyword>
+		<keyword>WINDOW</keyword>
+		<keyword>WITH</keyword>
+		<keyword>WITHIN</keyword>
+		<keyword>WITHOUT</keyword>
+		<keyword>YEAR</keyword>
+	</highlighter>
+</highlighters>

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

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<highlighters>
+	<highlighter type="oneline-comment">#</highlighter>
+	<highlighter type="string">
+		<string>"</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="string">
+		<string>'</string>
+		<escape>\</escape>
+	</highlighter>
+	<highlighter type="annotation">
+		<start>@</start>
+		<valueStart>(</valueStart>
+		<valueEnd>)</valueEnd>
+	</highlighter>
+	<highlighter type="number">
+		<point>.</point>
+		<exponent>e</exponent>
+		<suffix>f</suffix>
+		<suffix>d</suffix>
+		<suffix>l</suffix>
+		<ignoreCase/>
+	</highlighter>
+	<highlighter type="keywords">
+		<keyword>true</keyword>
+		<keyword>false</keyword>
+	</highlighter>
+	<highlighter type="word">
+		<word>{</word>
+		<word>}</word>
+		<word>,</word>
+		<word>[</word>
+		<word>]</word>
+		<style>keyword</style>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(---)$</pattern>
+		<style>comment</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+	<highlighter type="regex">
+		<pattern>^(.+?)(?==|:)</pattern>
+		<style>attribute</style>
+		<flags>MULTILINE</flags>
+	</highlighter>
+</highlighters>

docs/src/main/groovy/org/springframework/cloud/internal/Main.groovy

@@ -1,112 +0,0 @@
-package org.springframework.cloud.internal
-
-import java.util.regex.Pattern
-
-import groovy.json.JsonSlurper
-import groovy.transform.CompileStatic
-
-import org.springframework.core.io.Resource
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver
-
-/**
- * @author Marcin Grzejszczak
- */
-class Main {
-
-	@CompileStatic
-	static void main(String... args) {
-		String outputFile = args[0]
-		String inclusionPattern = args.length > 1 ? args[1] : ".*"
-		File parent = new File(outputFile).parentFile
-		if (!parent.exists()) {
-			println "No parent directory [${parent.toString()}] found. Won't generate the configuration properties file"
-			return
-		}
-		new Generator().generate(outputFile, inclusionPattern)
-	}
-
-	static class Generator {
-		void generate(String outputFile, String inclusionPattern) {
-			println "Parsing all configuration metadata"
-			Resource[] resources = getResources()
-			println "Found [${resources.length}] configuration metadata jsons"
-			TreeSet names = new TreeSet()
-			def descriptions = [:]
-			int count = 0
-			int matchingPropertyCount = 0
-			int propertyCount = 0
-			Pattern pattern = Pattern.compile(inclusionPattern)
-			resources.each { Resource resource ->
-				if (resourceNameContainsPattern(resource)) {
-					count++
-					def slurper = new JsonSlurper()
-					slurper.parseText(resource.inputStream.text).properties.each { val ->
-						propertyCount++
-						if (!pattern.matcher(val.name).matches()) {
-							return
-						}
-						matchingPropertyCount++
-						names.add val.name
-						descriptions[val.name] = new ConfigValue(val.name, val.description, val.defaultValue)
-					}
-				}
-			}
-			println "Found [${count}] Cloud projects configuration metadata jsons. [${matchingPropertyCount}/${propertyCount}] were matching the pattern [${inclusionPattern}]"
-			println "Successfully built the description table"
-			if (names.empty) {
-				println("Will not update the table, since no configuration properties were found!")
-				return
-			}
-			new File(outputFile).text = """\
-|===
-|Name | Default | Description
-
-${names.collect { it -> return descriptions[it] }.join("\n")}
-
-|===
-"""
-			println "Successfully stored the output file"
-		}
-
-		protected boolean resourceNameContainsPattern(Resource resource) {
-			try {
-				return resource.getURL().toString().contains("cloud")
-			}
-			catch (Exception e) {
-				println("Exception [${e}] for resource [${resource}] occurred while trying to retrieve its URL")
-				return false
-			}
-		}
-
-		protected Resource[] getResources() {
-			return new PathMatchingResourcePatternResolver()
-					.getResources("classpath*:/META-INF/spring-configuration-metadata.json")
-		}
-
-	}
-
-
-	@CompileStatic
-	static class ConfigValue {
-		String name
-		String description
-		Object defaultValue
-
-		ConfigValue() {}
-
-		ConfigValue(String name, String description, Object defaultValue) {
-			this.name = name
-			this.description = escapedValue(description)
-			this.defaultValue = escapedValue(defaultValue)
-		}
-
-		private String escapedValue(Object value) {
-			return value != null ?
-					value.toString().replaceAll('\\|', '\\\\|') : ''
-		}
-
-		String toString() {
-			"|${name} | ${defaultValue} | ${description}"
-		}
-	}
-}

docs/src/test/bash/build-helper.sh

@@ -1,82 +0,0 @@
-#!/bin/bash
-
-[[ -z $DEBUG ]] || set -o xtrace
-
-set -o errexit
-set -o errtrace
-set -o nounset
-set -o pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT_DIR="${ROOT_DIR}/../../.."
-echo "Root directory is [${ROOT_DIR}]"
-
-function usage {
-    echo "usage: $0: <download-shellcheck|run-shellcheck|download-bats|run-bats|initialize-submodules>"
-    exit 1
-}
-
-if [[ $# -ne 1 ]]; then
-    usage
-fi
-
-SHELLCHECK_VERSION="v0.6.0"
-SHELLCHECK_BIN="${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck"
-
-case $1 in
-    download-shellcheck)
-        if [[ "${OSTYPE}" == linux* && ! -z "${SHELLCHECK_BIN}" ]]; then
-            SHELLCHECK_ARCHIVE="shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz"
-            if [[ -x "${ROOT_DIR}/../target/shellcheck-${SHELLCHECK_VERSION}/shellcheck" ]]; then
-                echo "shellcheck already downloaded - skipping..."
-                exit 0
-            fi
-            wget -P "${ROOT_DIR}/../target/" \
-                "https://storage.googleapis.com/shellcheck/${SHELLCHECK_ARCHIVE}"
-            pushd "${ROOT_DIR}/../target/"
-            tar xvf "${SHELLCHECK_ARCHIVE}"
-            rm -vf -- "${SHELLCHECK_ARCHIVE}"
-            popd
-        else
-            echo "It seems that automatic installation is not supported on your platform."
-            echo "Please install shellcheck manually:"
-            echo "    https://github.com/koalaman/shellcheck#installing"
-            exit 1
-        fi
-        ;;
-    run-shellcheck)
-            echo "Running shellcheck"
-            "${SHELLCHECK_BIN}" "${ROOT_DIR}"/src/main/asciidoc/*.sh
-            echo "Shellcheck passed sucessfully!"
-        ;;
-    download-bats)
-        if [[ -x "${ROOT_DIR}/../target/bats/bin/bats" ]]; then
-            echo "bats already downloaded - skipping..."
-            exit 0
-        fi
-        git clone https://github.com/bats-core/bats-core.git "${ROOT_DIR}/../target/bats"
-        ;;
-    run-bats)
-            echo "Running bats"
-            SHELLCHECK_BIN="${ROOT_DIR}/../target/bats/bin/bats"
-            "${SHELLCHECK_BIN}" "${ROOT_DIR}"/src/test/bats
-            echo "Bats passed sucesfully!"
-        ;;
-    initialize-submodules)
-        files="$( ls "${ROOT_DIR}/src/test/bats/test_helper/bats-assert/" || echo "" )"
-        pushd "${ROOT_DIR}/../"
-            if [ ! -z "${files}" ]; then
-                echo "Submodules already initialized";
-                git submodule foreach git pull origin master || echo "Failed to pull - continuing the script"
-            else
-                echo "Initilizing submodules"
-                git submodule init
-                git submodule update
-                git submodule foreach git pull origin master || echo "Failed to pull - continuing the script"
-            fi
-        popd
-        ;;
-    *)
-        usage
-        ;;
-esac

docs/src/test/bash/run-bats.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-[[ -z $DEBUG ]] || set -o xtrace
-
-set -o errexit
-set -o errtrace
-set -o nounset
-set -o pipefail
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-"${ROOT_DIR}"/build-helper.sh "initialize-submodules" || echo "Failed to init submodules"
-"${ROOT_DIR}"/build-helper.sh "download-shellcheck"
-"${ROOT_DIR}"/build-helper.sh "run-shellcheck"
-"${ROOT_DIR}"/build-helper.sh "download-bats"
-"${ROOT_DIR}"/build-helper.sh "run-bats"

docs/src/test/bats/fixtures/spring-cloud-static/git/COMMIT_EDITMSG

@@ -1 +0,0 @@
-Foo

docs/src/test/bats/fixtures/spring-cloud-static/git/HEAD

@@ -1 +0,0 @@
-ref: refs/heads/master

docs/src/test/bats/fixtures/spring-cloud-static/git/config

@@ -1,11 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-[remote "origin"]
-	url = file://.
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
-	remote = origin
-	merge = refs/heads/master

docs/src/test/bats/fixtures/spring-cloud-static/git/description

@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/applypatch-msg.sample

@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.  The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
-test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
-:

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/commit-msg.sample

@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message.  The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit.  The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
-	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
-	echo >&2 Duplicate Signed-off-by lines.
-	exit 1
-}

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/fsmonitor-watchman.sample

@@ -1,114 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use IPC::Open2;
-
-# An example hook script to integrate Watchman
-# (https://facebook.github.io/watchman/) with git to speed up detecting
-# new and modified files.
-#
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
-#
-# To enable this hook, rename this file to "query-watchman" and set
-# 'git config core.fsmonitor .git/hooks/query-watchman'
-#
-my ($version, $time) = @ARGV;
-
-# Check the hook interface version
-
-if ($version == 1) {
-	# convert nanoseconds to seconds
-	$time = int $time / 1000000000;
-} else {
-	die "Unsupported query-fsmonitor hook version '$version'.\n" .
-	    "Falling back to scanning...\n";
-}
-
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
-	$git_work_tree = Win32::GetCwd();
-	$git_work_tree =~ tr/\\/\//;
-} else {
-	require Cwd;
-	$git_work_tree = Cwd::cwd();
-}
-
-my $retry = 1;
-
-launch_watchman();
-
-sub launch_watchman {
-
-	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
-	    or die "open2() failed: $!\n" .
-	    "Falling back to scanning...\n";
-
-	# In the query expression below we're asking for names of files that
-	# changed since $time but were not transient (ie created after
-	# $time but no longer exist).
-	#
-	# To accomplish this, we're using the "since" generator to use the
-	# recency index to select candidate nodes and "fields" to limit the
-	# output to file names only. Then we're using the "expression" term to
-	# further constrain the results.
-	#
-	# The category of transient files that we want to ignore will have a
-	# creation clock (cclock) newer than $time_t value and will also not
-	# currently exist.
-
-	my $query = <<"	END";
-		["query", "$git_work_tree", {
-			"since": $time,
-			"fields": ["name"],
-			"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
-		}]
-	END
-
-	print CHLD_IN $query;
-	close CHLD_IN;
-	my $response = do {local $/; <CHLD_OUT>};
-
-	die "Watchman: command returned no output.\n" .
-	    "Falling back to scanning...\n" if $response eq "";
-	die "Watchman: command returned invalid output: $response\n" .
-	    "Falling back to scanning...\n" unless $response =~ /^\{/;
-
-	my $json_pkg;
-	eval {
-		require JSON::XS;
-		$json_pkg = "JSON::XS";
-		1;
-	} or do {
-		require JSON::PP;
-		$json_pkg = "JSON::PP";
-	};
-
-	my $o = $json_pkg->new->utf8->decode($response);
-
-	if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
-		print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
-		$retry--;
-		qx/watchman watch "$git_work_tree"/;
-		die "Failed to make watchman watch '$git_work_tree'.\n" .
-		    "Falling back to scanning...\n" if $? != 0;
-
-		# Watchman will always return all files on the first query so
-		# return the fast "everything is dirty" flag to git and do the
-		# Watchman query just to get it over with now so we won't pay
-		# the cost in git to look up each individual file.
-		print "/\0";
-		eval { launch_watchman() };
-		exit 0;
-	}
-
-	die "Watchman: $o->{error}.\n" .
-	    "Falling back to scanning...\n" if $o->{error};
-
-	binmode STDOUT, ":utf8";
-	local $, = "\0";
-	print @{$o->{files}};
-}

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/post-update.sample

@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/pre-applypatch.sample

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-precommit="$(git rev-parse --git-path hooks/pre-commit)"
-test -x "$precommit" && exec "$precommit" ${1+"$@"}
-:

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/pre-commit.sample

@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
-	against=HEAD
-else
-	# Initial commit: diff against an empty tree object
-	against=$(git hash-object -t tree /dev/null)
-fi
-
-# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ASCII filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
-	# Note that the use of brackets around a tr range is ok here, (it's
-	# even required, for portability to Solaris 10's /usr/bin/tr), since
-	# the square bracket bytes happen to fall in the designated range.
-	test $(git diff --cached --name-only --diff-filter=A -z $against |
-	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
-	cat <<\EOF
-Error: Attempt to add a non-ASCII file name.
-
-This can cause problems if you want to work with people on other platforms.
-
-To be portable it is advisable to rename the file.
-
-If you know what you are doing you can disable this check using:
-
-  git config hooks.allownonascii true
-EOF
-	exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/pre-push.sample

@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# An example hook script to verify what is about to be pushed.  Called by "git
-# push" after it has checked the remote status, but before anything has been
-# pushed.  If this script exits with a non-zero status nothing will be pushed.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-#
-# This sample shows how to prevent push of commits where the log message starts
-# with "WIP" (work in progress).
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-while read local_ref local_sha remote_ref remote_sha
-do
-	if [ "$local_sha" = $z40 ]
-	then
-		# Handle delete
-		:
-	else
-		if [ "$remote_sha" = $z40 ]
-		then
-			# New branch, examine all commits
-			range="$local_sha"
-		else
-			# Update to existing branch, examine new commits
-			range="$remote_sha..$local_sha"
-		fi
-
-		# Check for WIP commit
-		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
-		if [ -n "$commit" ]
-		then
-			echo >&2 "Found WIP commit in $local_ref, not pushing"
-			exit 1
-		fi
-	fi
-done
-
-exit 0

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/pre-rebase.sample

@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
-	topic="refs/heads/$2"
-else
-	topic=`git symbolic-ref HEAD` ||
-	exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
-	;;
-*)
-	exit 0 ;# we do not interrupt others.
-	;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master.  Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
-	echo >&2 "No such branch $topic"
-	exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
-	echo >&2 "$topic is fully merged to master; better remove it."
-	exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next?  If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master           ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
-	not_in_topic=`git rev-list "^$topic" master`
-	if test -z "$not_in_topic"
-	then
-		echo >&2 "$topic is already up to date with master"
-		exit 1 ;# we could allow it, but there is no point.
-	else
-		exit 0
-	fi
-else
-	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
-	/usr/bin/perl -e '
-		my $topic = $ARGV[0];
-		my $msg = "* $topic has commits already merged to public branch:\n";
-		my (%not_in_next) = map {
-			/^([0-9a-f]+) /;
-			($1 => 1);
-		} split(/\n/, $ARGV[1]);
-		for my $elem (map {
-				/^([0-9a-f]+) (.*)$/;
-				[$1 => $2];
-			} split(/\n/, $ARGV[2])) {
-			if (!exists $not_in_next{$elem->[0]}) {
-				if ($msg) {
-					print STDERR $msg;
-					undef $msg;
-				}
-				print STDERR " $elem->[1]\n";
-			}
-		}
-	' "$topic" "$not_in_next" "$not_in_master"
-	exit 1
-fi
-
-<<\DOC_END
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
-   merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
-   it is deleted.  If you need to build on top of it to correct
-   earlier mistakes, a new topic branch is created by forking at
-   the tip of the "master".  This is not strictly necessary, but
-   it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
-   branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next".  Young
-    topic branches can have stupid mistakes you would rather
-    clean up before publishing, and things that have not been
-    merged into other branches can be easily rebased without
-    affecting other people.  But once it is published, you would
-    not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
-    Then you can delete it.  More importantly, you should not
-    build on top of it -- other people may already want to
-    change things related to the topic as patches against your
-    "master", so if you need further changes, it is better to
-    fork the topic (perhaps with the same name) afresh from the
-    tip of "master".
-
-Let's look at this example:
-
-		   o---o---o---o---o---o---o---o---o---o "next"
-		  /       /           /           /
-		 /   a---a---b A     /           /
-		/   /               /           /
-	       /   /   c---c---c---c B         /
-	      /   /   /             \         /
-	     /   /   /   b---b C     \       /
-	    /   /   /   /             \     /
-    ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished.  It has been fully merged up to "master" and "next",
-   and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
-	git rev-list ^master ^topic next
-	git rev-list ^master        next
-
-	if these match, topic has not merged in next at all.
-
-To compute (2):
-
-	git rev-list master..topic
-
-	if this is empty, it is fully merged to "master".
-
-DOC_END

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/pre-receive.sample

@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to make use of push options.
-# The example simply echoes all push options that start with 'echoback='
-# and rejects all pushes when the "reject" push option is used.
-#
-# To enable this hook, rename this file to "pre-receive".
-
-if test -n "$GIT_PUSH_OPTION_COUNT"
-then
-	i=0
-	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
-	do
-		eval "value=\$GIT_PUSH_OPTION_$i"
-		case "$value" in
-		echoback=*)
-			echo "echo from the pre-receive-hook: ${value#*=}" >&2
-			;;
-		reject)
-			exit 1
-		esac
-		i=$((i + 1))
-	done
-fi

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/prepare-commit-msg.sample

@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source.  The hook's purpose is to edit the commit
-# message file.  If the hook fails with a non-zero status,
-# the commit is aborted.
-#
-# To enable this hook, rename this file to "prepare-commit-msg".
-
-# This hook includes three examples. The first one removes the
-# "# Please enter the commit message..." help message.
-#
-# The second includes the output of "git diff --name-status -r"
-# into the message, just before the "git status" output.  It is
-# commented because it doesn't cope with --amend or with squashed
-# commits.
-#
-# The third example adds a Signed-off-by line to the message, that can
-# still be edited.  This is rarely a good idea.
-
-COMMIT_MSG_FILE=$1
-COMMIT_SOURCE=$2
-SHA1=$3
-
-/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
-
-# case "$COMMIT_SOURCE,$SHA1" in
-#  ,|template,)
-#    /usr/bin/perl -i.bak -pe '
-#       print "\n" . `git diff --cached --name-status -r`
-# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
-#  *) ;;
-# esac
-
-# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
-# if test -z "$COMMIT_SOURCE"
-# then
-#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
-# fi

docs/src/test/bats/fixtures/spring-cloud-static/git/hooks/update.sample

@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to block unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-#   This boolean sets whether unannotated tags will be allowed into the
-#   repository.  By default they won't be.
-# hooks.allowdeletetag
-#   This boolean sets whether deleting tags will be allowed in the
-#   repository.  By default they won't be.
-# hooks.allowmodifytag
-#   This boolean sets whether a tag may be modified after creation. By default
-#   it won't be.
-# hooks.allowdeletebranch
-#   This boolean sets whether deleting branches will be allowed in the
-#   repository.  By default they won't be.
-# hooks.denycreatebranch
-#   This boolean sets whether remotely creating branches will be denied
-#   in the repository.  By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
-	echo "Don't run this script from the command line." >&2
-	echo " (if you want, you could supply GIT_DIR then run" >&2
-	echo "  $0 <ref> <oldrev> <newrev>)" >&2
-	exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
-	exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
-	echo "*** Project description file hasn't been set" >&2
-	exit 1
-	;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
-	newrev_type=delete
-else
-	newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
-	refs/tags/*,commit)
-		# un-annotated tag
-		short_refname=${refname##refs/tags/}
-		if [ "$allowunannotated" != "true" ]; then
-			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
-			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,delete)
-		# delete tag
-		if [ "$allowdeletetag" != "true" ]; then
-			echo "*** Deleting a tag is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,tag)
-		# annotated tag
-		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
-		then
-			echo "*** Tag '$refname' already exists." >&2
-			echo "*** Modifying a tag is not allowed in this repository." >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,commit)
-		# branch
-		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
-			echo "*** Creating a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,delete)
-		# delete branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/remotes/*,commit)
-		# tracking branch
-		;;
-	refs/remotes/*,delete)
-		# delete tracking branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	*)
-		# Anything else (is there anything else?)
-		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
-		exit 1
-		;;
-esac
-
-# --- Finished
-exit 0

docs/src/test/bats/fixtures/spring-cloud-static/git/info/exclude

@@ -1,6 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~

docs/src/test/bats/fixtures/spring-cloud-static/git/logs/HEAD

@@ -1,4 +0,0 @@
-0000000000000000000000000000000000000000 d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619277 +0100	commit (initial): Initial commit
-d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619297 +0100	checkout: moving from master to gh-pages
-d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 722a79af4a158c0076b4aaab7273750a35034738 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619310 +0100	commit: Foo
-722a79af4a158c0076b4aaab7273750a35034738 d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619315 +0100	checkout: moving from gh-pages to master

docs/src/test/bats/fixtures/spring-cloud-static/git/logs/refs/heads/gh-pages

@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619297 +0100	branch: Created from HEAD
-d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 722a79af4a158c0076b4aaab7273750a35034738 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619310 +0100	commit: Foo

docs/src/test/bats/fixtures/spring-cloud-static/git/logs/refs/heads/master

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 d999af9d9ffde37f31f69dc42e9c9c1be55c0b72 Marcin Grzejszczak <marcin@grzejszczak.pl> 1553619277 +0100	commit (initial): Initial commit

docs/src/test/bats/fixtures/spring-cloud-static/git/refs/heads/gh-pages

@@ -1 +0,0 @@
-722a79af4a158c0076b4aaab7273750a35034738

docs/src/test/bats/fixtures/spring-cloud-static/git/refs/heads/master

@@ -1 +0,0 @@
-d999af9d9ffde37f31f69dc42e9c9c1be55c0b72

docs/src/test/bats/ghpages.bats

@@ -1,552 +0,0 @@
-#!/usr/bin/env bats
-
-load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
-
-setup() {
-	export TEMP_DIR="$( mktemp -d )"
-	
-	cp -a "${SOURCE_DIR}" "${TEMP_DIR}/sc-build"
-
-	cp -a "${FIXTURES_DIR}/spring-cloud-stream" "${TEMP_DIR}/"
-	mv "${TEMP_DIR}/spring-cloud-stream/git" "${TEMP_DIR}/spring-cloud-stream/.git"
-	cp -a "${FIXTURES_DIR}/spring-cloud-static" "${TEMP_DIR}/"
-	mv "${TEMP_DIR}/spring-cloud-static/git" "${TEMP_DIR}/spring-cloud-static/.git"
-
-	export SOURCE_FUNCTIONS="true"
-	export GITHUB_REPO_USERNAME_ENV="MY_REPO_USERNAME"
-	export GITHUB_REPO_PASSWORD_ENV="MY_REPO_PASSWORD"
-	export SPRING_CLOUD_STATIC_REPO_DESTINATION="${TEMP_DIR}"
-}
-
-teardown() {
-	rm -rf "${TEMP_DIR}"
-}
-
-function fake_git {
-	if [[ "$*" == *"push"* ]]; then
-		echo "pushing the project"
-	elif [[ "$*" == *"pull"* ]]; then
-		echo "pulling the project"
-	fi
-	git $*
-}
-
-function git_with_remotes {
-	if [[ "$*" == *"set-url"* ]]; then
-		echo "git $*"
-	elif [[ "$*" == *"config remote.origin.url"* ]]; then
-		echo "git://example1.example2/example3.git"
-	else 
-		git $*
-	fi
-}
-
-function printing_git {
-	echo "git $*"
-}
-
-function printing_git_failing_with_diff_index {
-	if [[ "$*" == *"diff-index"* ]]; then
-		return 1
-	else 
-		echo "git $*"
-	fi
-}
-
-function printing_git_with_remotes {
-	if [[ "$*" == *"config remote.origin.url"* ]]; then
-		echo "git://example1.example2/example3.git"
-	else 
-		printing_git $*
-	fi
-}
-
-function stubbed_git {
-	if [[ "$*" == *"config remote.origin.url"* ]]; then
-		echo "git://example1.example2/example3.git"
-	elif [[ "$*" == *"diff-index"* ]]; then
-		return 1
-	elif [[ "$*" == *"symbolic-ref"* ]]; then
-		echo "master"
-	elif [[ "$*" == *"remote -v"* ]]; then
-		git $*
-	else 
-		printing_git $*
-	fi
-}
-
-export -f fake_git
-export -f git_with_remotes
-export -f printing_git
-export -f printing_git_with_remotes
-export -f stubbed_git
-
-@test "should upload the built docs to the root of gh-pages for snapshot versions" {
-	export GIT_BIN="stubbed_git"
-	export SOURCE_FUNCTIONS=""
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	mkdir -p docs/target/generated-docs/
-	touch docs/target/generated-docs/example1.html
-
-	run "${SOURCE_DIR}"/ghpages.sh
-
-	assert_success
-	assert_output --partial "Spring Cloud Static repo is [${TEMP_DIR}]"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git fetch -q"
-	assert_output --partial "git checkout master"
-	assert_output --partial "git stash"
-	assert_output --partial "git checkout gh-pages"
-	assert_output --partial "git pull origin gh-pages"
-	# Current branch is master - will copy the current docs only to the root folder
-	assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-stream"
-   	assert_output --partial "git commit -a -m Sync docs from master to gh-pages"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git push origin gh-pages"
-	assert_output --partial "git checkout master"
-	assert_output --partial "git stash pop"
-}
-
-@test "should upload the built docs to spring-cloud-static gh-pages branch for non-snapshot versions" {
-	export GIT_BIN="stubbed_git"
-	export SOURCE_FUNCTIONS=""
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-	export VERSION="1.0.0.RELEASE"
-	export DESTINATION="${TEMP_DIR}/spring-cloud-static"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	mkdir -p docs/target/generated-docs/
-	touch docs/target/generated-docs/example1.html
-
-	run "${SOURCE_DIR}"/ghpages.sh
-
-	assert_success
-	assert_output --partial "Spring Cloud Static repo is [${TEMP_DIR}]"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git remote set-branches --add origin gh-pages"
-	assert_output --partial "git fetch -q"
-	# Previous branch was [master]
-	assert_output --partial "git checkout master"
-	assert_output --partial "git checkout v1.0.0.RELEASE"
-	assert_output --partial "git stash"
-	assert_output --partial "git checkout gh-pages"
-	assert_output --partial "git pull origin gh-pages"
-	# Current branch is master - will copy the current docs only to the root folder
-	assert [ -f "${TEMP_DIR}/spring-cloud-static/spring-cloud-stream/${VERSION}/example1.html" ]
-	assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-static/spring-cloud-stream/${VERSION}"
-   	assert_output --partial "git commit -a -m Sync docs from v1.0.0.RELEASE to gh-pages"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git push origin gh-pages"
-	assert_output --partial "git checkout master"
-	assert_output --partial "git stash pop"
-}
-
-@test "should upload the release train docs to spring-cloud-static under the release train folder" {
-	export GIT_BIN="stubbed_git"
-	export SOURCE_FUNCTIONS=""
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-	export VERSION="Greenwich.SR2"
-	export DESTINATION="${TEMP_DIR}/spring-cloud-static"
-	export RELEASE_TRAIN="yes"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	mkdir -p docs/target/generated-docs/
-	touch docs/target/generated-docs/example1.html
-
-	run "${SOURCE_DIR}"/ghpages.sh
-
-	assert_success
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	# Previous branch was [master]
-	assert_output --partial "git checkout master"
-	assert_output --partial "git stash"
-	assert_output --partial "git checkout gh-pages"
-	assert_output --partial "git pull origin gh-pages"
-	# Current branch is master - will copy the current docs only to the root folder
-	assert [ -f "${TEMP_DIR}/spring-cloud-static/${VERSION}/example1.html" ]
-	assert_output --partial "git add -A ${TEMP_DIR}/spring-cloud-static/${VERSION}"
-   	assert_output --partial "git commit -a -m Sync docs from vGreenwich.SR2 to gh-pages"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git push origin gh-pages"
-	assert_output --partial "git checkout master"
-	assert_output --partial "git stash pop"
-}
-
-@test "should set all the env vars" {
-	export SPRING_CLOUD_STATIC_REPO="${TEMP_DIR}/spring-cloud-static"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	set_default_props
-
-	assert_success
-	assert [ "${ROOT_FOLDER}" != "" ]
-	assert [ "${MAVEN_EXEC}" != "" ]
-	assert [ "${REPO_NAME}" != "" ]
-	assert [ "${SPRING_CLOUD_STATIC_REPO}" != "" ]
-}
-
-@test "should not add auth token to URL if token not present" {
-	export GIT_BIN="git_with_remotes"
-	export RELEASER_GIT_OAUTH_TOKEN=""
-	
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run add_oauth_token_to_remote_url
-
-	assert_success
-	assert_output --partial "git remote set-url --push origin https://example1.example2/example3.git"
-}
-
-@test "should add auth token to URL if token is present" {
-	export GIT_BIN="git_with_remotes"
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-	
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run add_oauth_token_to_remote_url
-
-	assert_success
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-}
-
-@test "should retrieve the name of the current branch" {
-	export GIT_BIN="stubbed_git"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run retrieve_current_branch
-
-	assert_success
-	assert_output --partial "git checkout master"
-}
-
-@test "should retrieve the name of the current branch when previous branch was set" {
-	export GIT_BIN="printing_git"
-	export BRANCH="gh-pages"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run retrieve_current_branch
-
-	assert_success
-	assert_output --partial "Current branch is [gh-pages]"
-	refute_output --partial "git checkout git symbolic-ref -q HEAD"
-	assert_output --partial "git checkout gh-pages"
-	assert_output --partial "Previous branch was [gh-pages]"
-}
-
-@test "should not switch to tag for release train" {
-	export GIT_BIN="printing_git"
-	export RELEASE_TRAIN="yes"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run switch_to_tag
-
-	assert_success
-	refute_output --partial "git checkout"
-}
-
-@test "should switch to tag for release train" {
-	export GIT_BIN="printing_git"
-	export RELEASE_TRAIN="no"
-	export VERSION="1.0.0"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run switch_to_tag
-
-	assert_success
-	assert_output --partial "git checkout v1.0.0"
-}
-
-@test "should not build docs when build option is disabled" {
-	export BUILD="no"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	echo -e '#!/bin/sh\necho $*' > mvnw
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run build_docs_if_applicable
-
-	assert_success
-	refute_output --partial "clean install"
-}
-
-@test "should build docs when build option is enabled" {
-	export BUILD="yes"
-
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	echo -e '#!/bin/sh\necho $*' > mvnw
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run build_docs_if_applicable
-
-	assert_success
-	assert_output --partial "clean install"
-}
-
-@test "should stash changes if dirty" {
-	export GIT_BIN="printing_git_failing_with_diff_index"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run stash_changes
-
-	assert_success
-	assert_output --partial "git stash"
-}
-
-@test "should not stash changes if repo is not dirty" {
-	export GIT_BIN="printing_git"
-	cd "${TEMP_DIR}/spring-cloud-static/"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run stash_changes
-
-	assert_success
-	refute_output --partial "git stash"
-}
-
-@test "should add and commit all non ignored files for master branch" {
-	export GIT_BIN="printing_git"
-	export CURRENT_BRANCH="master"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	mkdir -p docs/target/generated-docs/
-	touch docs/target/generated-docs/example1.html
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	copy_docs_for_current_version
-
-	assert_success
-	assert [ "${COMMIT_CHANGES}" == "yes" ]
-}
-
-@test "should add and commit all non ignored files for a custom branch and convert root file to index.html" {
-	export GIT_BIN="printing_git"
-	export CURRENT_BRANCH="present"
-	export WHITELISTED_BRANCHES_VALUE="present"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-	mkdir -p docs/target/generated-docs/
-	touch docs/target/generated-docs/my_doc.html
-	touch docs/target/generated-docs/example1.html
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	copy_docs_for_current_version
-
-	assert_success
-	assert [ "${COMMIT_CHANGES}" == "yes" ]
-
-	run copy_docs_for_current_version
-
-	assert_success
-	assert_output --partial "add -A ${ROOT_FOLDER}/present/my_doc.html"
-	assert_output --partial "add -A ${ROOT_FOLDER}/present/example1.html"
-}
-
-@test "should do nothing if current branch is not whitelisted" {
-	export CURRENT_BRANCH="custom"
-	export WHITELISTED_BRANCHES_VALUE="non_present"
-	cd "${TEMP_DIR}/spring-cloud-stream/"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	copy_docs_for_current_version
-
-	assert_success
-	assert [ "${COMMIT_CHANGES}" != "yes" ]
-}
-
-@test "should not do anything if commit flag not set" {
-	export GIT_BIN="printing_git_with_remotes"
-	export COMMIT_CHANGES="no"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run commit_changes_if_applicable
-
-	assert_success
-	refute_output --partial "git"
-}
-
-@test "should commit changes if commit flag set" {
-	export GIT_BIN="printing_git_with_remotes"
-	export COMMIT_CHANGES="yes"
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run commit_changes_if_applicable
-
-	assert_success
-	assert_output --partial "git commit -a -m Sync docs from to gh-pages"
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	assert_output --partial "git push origin gh-pages"
-}
-
-@test "should commit changes with username and password if commit flag set" {
-	export GIT_BIN="printing_git_with_remotes"
-	export COMMIT_CHANGES="yes"
-	export MY_REPO_USERNAME="username"
-	export MY_REPO_PASSWORD="password"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run commit_changes_if_applicable
-
-	assert_success
-	assert_output --partial "git commit -a -m Sync docs from to gh-pages"
-	assert_output --partial "git remote set-url --push origin https://username:password@example1.example2/example3.git"
-	assert_output --partial "git push origin gh-pages"
-}
-
-@test "should checkout previous branch and pop changes from stash when dirty" {
-	export GIT_BIN="printing_git"
-	export PREVIOUS_BRANCH="previous_branch"
-	export dirty="1"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run checkout_previous_branch
-
-	assert_success
-	assert_output --partial "git checkout previous_branch"
-	assert_output --partial "git stash pop"
-}
-
-@test "should checkout previous branch and not pop changes from stash when not dirty" {
-	export GIT_BIN="printing_git"
-	export PREVIOUS_BRANCH="previous_branch"
-	export dirty="0"
-
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run checkout_previous_branch
-
-	assert_success
-	assert_output --partial "git checkout previous_branch"
-	refute_output --partial "git stash pop"
-}
-
-@test "should fail when version was set but destination / clone was not" {
-	export VERSION="1.0.0.RELEASE"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_failure
-}
-
-@test "should pass when version was set and destination was too" {
-	export VERSION="1.0.0.RELEASE"
-	export DESTINATION="/tmp/foo"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_success
-}
-
-@test "should pass when version was set and clone was too" {
-	export VERSION="1.0.0.RELEASE"
-	export CLONE="true"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_success
-}
-
-@test "should fail when destination and clone were set but version was not" {
-	export DESTINATION="/tmp/foo"
-	export CLONE="true"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_failure
-}
-
-@test "should pass when destination and clone and version were set" {
-	export DESTINATION="/tmp/foo"
-	export CLONE="true"
-	export VERSION="1.0.0.RELEASE"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_success
-}
-
-@test "should fail when clone was set to true and destination is defined" {
-	export CLONE="true"
-	export DESTINATION="/tmp/foo"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_failure
-}
-
-@test "should pass when clone was set to true and destination is not defined" {
-	export DESTINATION=""
-	export CLONE="true"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_success
-}
-
-@test "should fail when release train was set but no version was passed" {
-	export VERSION=""
-	export RELEASE_TRAIN="true"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_failure
-}
-
-@test "should pass when release train was set and version and clone was passed" {
-	export VERSION="Greenwich.SR1"
-	export CLONE="true"
-	export RELEASE_TRAIN="true"
-	
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run assert_properties
-
-	assert_success
-}
-
-@test "should print the usage" {
-	source "${SOURCE_DIR}"/ghpages.sh
-
-	run print_usage
-
-	assert_success
-	assert_output --partial "The idea of this script"
-}

docs/src/test/bats/test_helper.bash

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-FIXTURES_DIR="${BATS_TEST_DIRNAME}/fixtures"
-SOURCE_DIR="${BATS_TEST_DIRNAME}/../../main/asciidoc"
-
-export FIXTURES_DIR SOURCE_DIR

docs/src/test/bats/update-guides.bats

@@ -1,124 +0,0 @@
-#!/usr/bin/env bats
-
-load 'test_helper'
-load 'test_helper/bats-support/load'
-load 'test_helper/bats-assert/load'
-
-setup() {
-	export TEMP_DIR="$( mktemp -d )"
-	export COPIED_SOURCES="${TEMP_DIR}/sc-build"
-	export PROJECT_VERSION="1.0.0.RELEASE"
-
-	cp -a "${SOURCE_DIR}" "${COPIED_SOURCES}"
-
-	cp -a "${FIXTURES_DIR}/gs-contract-rest" "${TEMP_DIR}/"
-	cp -a "${FIXTURES_DIR}/guides" "${TEMP_DIR}/"
-	mv "${TEMP_DIR}/gs-contract-rest/git" "${TEMP_DIR}/gs-contract-rest/.git"
-}
-
-teardown() {
-	rm -rf "${TEMP_DIR}"
-}
-
-function fake_git {
-	if [[ "$*" == *"push"* ]]; then
-		echo "pushing the project"
-	elif [[ "$*" == *"pull"* ]]; then
-		echo "pulling the project"
-	fi
-	git $*
-}
-
-function git_with_remotes {
-	if [[ "$*" == *"set-url"* ]]; then
-		echo "git $*"
-	elif [[ "$*" == *"config remote.origin.url"* ]]; then
-		echo "git://example1.example2/example3.git"
-	else 
-		git $*
-	fi
-}
-
-function printing_git {
-	echo "git $*"
-}
-
-function printing_git_with_remotes {
-	if [[ "$*" == *"config remote.origin.url"* ]]; then
-		echo "git://example1.example2/example3.git"
-	else 
-		printing_git $*
-	fi
-}
-
-function stubbed_git {
- 	if [[ "$*" == *"config remote.origin.url"* ]]; then
- 		echo "git://example1.example2/example3.git"
- 	elif [[ "$*" == *"commit"* ]]; then
- 		printing_git $*
- 	elif [[ "$*" == *"push"* ]]; then
- 		printing_git $*
- 	else
- 		git $*
- 	fi
- }
-
-export -f printing_git
-export -f printing_git_with_remotes
-export -f stubbed_git
-
-@test "should do nothing when project version is not release" {
-	cd "${TEMP_DIR}"
-	mkdir .git
-	export GIT_BIN="stubbed_git"
-	export SPRING_GUIDES_REPO_ROOT="$( pwd )"
-	export PROJECT_VERSION="1.0.0.BUILD-SNAPSHOT"
-
-	run "${COPIED_SOURCES}"/update-guides.sh
-
-	assert_success
-	refute_output --partial "git"
-}
-
-@test "should fail if we're not in the root of the project" {
-	cd "${TEMP_DIR}/sc-build"
-	export GIT_BIN="printing_git_with_remotes"
-
-	run "${COPIED_SOURCES}"/update-guides.sh
-
-	assert_failure
-}
-
-@test "should do nothing when no guides folder is present" {
-	cd "${TEMP_DIR}/sc-build"
-	mkdir .git
-	export GIT_BIN="printing_git_with_remotes"
-
-	run "${COPIED_SOURCES}"/update-guides.sh
-
-	assert_success
-	refute_output --partial "git clone"
-}
-
-@test "should commit and push latest guides" {
-	cd "${TEMP_DIR}"
-	mkdir .git
-	export GIT_BIN="stubbed_git"
-	export SPRING_GUIDES_REPO_ROOT="$( pwd )"
-	export RELEASER_GIT_OAUTH_TOKEN="mytoken"
-
-	run "${COPIED_SOURCES}"/update-guides.sh
-
-	assert_success
-	# change remote
-	assert_output --partial "git remote set-url --push origin https://mytoken@example1.example2/example3.git"
-	# commit and push
-	assert_output --partial "git commit -m Updating guides"
-	assert_output --partial "git push origin master"
-	# check the contents, old ones deleted, new ones present
-	assert [ -f "${TEMP_DIR}/target/gs-contract-rest/ONE.adoc" ]
-	assert [ -f "${TEMP_DIR}/target/gs-contract-rest/complete/COMPLETE.adoc" ]
-	assert [ -f "${TEMP_DIR}/target/gs-contract-rest/initial/INITIAL.adoc" ]
-	assert [ -f "${TEMP_DIR}/target/gs-contract-rest/test/TEST.adoc" ]
-	assert [ ! -f "${TEMP_DIR}/target/gs-contract-rest/README.adoc" ]
-}

docs/src/test/java/org/springframework/cloud/internal/GeneratorTests.java

@@ -1,116 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-
-import org.junit.jupiter.api.Test;
-
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.core.io.Resource;
-
-import static org.assertj.core.api.BDDAssertions.then;
-
-class GeneratorTests {
-
-	URL root = GeneratorTests.class.getResource(".");
-
-	@Test
-	void should_not_create_a_file_when_no_properties_were_found()
-			throws URISyntaxException {
-		Main.Generator generator = new Main.Generator() {
-			@Override
-			protected Resource[] getResources() {
-				return new Resource[0];
-			}
-		};
-		File file = new File(root.toURI().toString(), "output.adoc");
-		String inclusionPattern = ".*";
-
-		generator.generate(file.getAbsolutePath(), inclusionPattern);
-
-		then(file).doesNotExist();
-	}
-
-	@Test
-	void should_create_a_file_when_cloud_file_was_found() {
-		Main.Generator generator = new Main.Generator() {
-			@Override
-			protected Resource[] getResources() {
-				return new Resource[] { resource("/not-matching-name.json"),
-						resource("/with-cloud-in-name.json") };
-			}
-
-			@Override
-			protected boolean resourceNameContainsPattern(Resource resource) {
-				try {
-					return resource.getURI().toString().contains("with-cloud");
-				}
-				catch (IOException ex) {
-					throw new IllegalStateException(ex);
-				}
-			}
-		};
-		File file = new File(root.getFile().toString(), "output.adoc");
-		String inclusionPattern = ".*";
-
-		generator.generate(file.getAbsolutePath(), inclusionPattern);
-
-		then(file).exists();
-		then(asString(file)).contains("spring.first-property")
-				.contains("unmatched.second-property")
-				.doesNotContain("example1.first-property");
-	}
-
-	@Test
-	void should_create_a_file_when_spring_property_was_found() {
-		Main.Generator generator = new Main.Generator() {
-			@Override
-			protected Resource[] getResources() {
-				return new Resource[] { resource("/not-matching-name.json"),
-						resource("/with-cloud-in-name.json") };
-			}
-		};
-		File file = new File(root.getFile().toString(), "output.adoc");
-		String inclusionPattern = "spring.*";
-
-		generator.generate(file.getAbsolutePath(), inclusionPattern);
-
-		then(file).exists();
-		then(asString(file)).contains("spring.first-property")
-				.doesNotContain("example1.first-property")
-				.doesNotContain("unmatched.second-property");
-	}
-
-	static String asString(File file) {
-		try {
-			return new String(Files.readAllBytes(file.toPath()));
-		}
-		catch (IOException ex) {
-			throw new IllegalStateException(ex);
-		}
-	}
-
-	static Resource resource(String path) {
-		return new FileSystemResource(GeneratorTests.class.getResource(path).getFile());
-	}
-
-}

docs/src/test/java/org/springframework/cloud/internal/MainTests.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.internal;
-
-import java.io.File;
-
-import org.junit.jupiter.api.Test;
-
-import static org.assertj.core.api.BDDAssertions.then;
-
-class MainTests {
-
-	@Test
-	void should_do_nothing_when_parent_dir_is_not_found() {
-		File nonExistantFile = new File("/this/file/does/not/exist");
-
-		Main.main(nonExistantFile.getAbsolutePath());
-
-		then(nonExistantFile).doesNotExist();
-	}
-}

docs/src/test/resources/not-matching-name.json

@@ -1,16 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": "false",
-      "name": "example1.first-property",
-      "description": "First Description",
-      "type": "java.lang.Boolean"
-    },
-    {
-      "defaultValue": "true",
-      "name": "example2.second-property",
-      "description": "Second Description",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}

docs/src/test/resources/with-cloud-in-name.json

@@ -1,16 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": "false",
-      "name": "spring.first-property",
-      "description": "First Description",
-      "type": "java.lang.Boolean"
-    },
-    {
-      "defaultValue": "true",
-      "name": "unmatched.second-property",
-      "description": "Second Description",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}

pom.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>2.2.0.M6</version>
+	<version>2.1.6.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,20 +27,9 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.2.0.RC1</spring-boot.version>
-		<spring-cloud-build.version>2.2.0.M6</spring-cloud-build.version>
+		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+		<spring-cloud-build.version>2.1.6.RELEASE</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
-		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
-		<spring-doc-resources.version>0.1.0.RELEASE</spring-doc-resources.version>
-		<spring-asciidoctor-extensions.version>0.1.3.RELEASE
-		</spring-asciidoctor-extensions.version>
-		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
-		<asciidoctorj-diagram.version>1.5.18</asciidoctorj-diagram.version>
-		<guides-project.version>${project.version}</guides-project.version>
-		<guides-update.phase>deploy</guides-update.phase>
-		<revision>${project.version}</revision>
-		<asciidoctorj.version>1.5.8</asciidoctorj.version>
-		<jruby-complete.version>9.2.7.0</jruby-complete.version>
 
 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -56,9 +44,9 @@
 		<!-- 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.9</spring-javaformat.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.1.0</maven-javadoc-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>
@@ -66,40 +54,32 @@
 		<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>3.0.0</git-commit-id-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.1</asciidoctor-maven-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>true</maven-checkstyle-plugin.failsOnError>
-		<maven-checkstyle-plugin.failOnViolation>true
+		<maven-checkstyle-plugin.failsOnError>false</maven-checkstyle-plugin.failsOnError>
+		<maven-checkstyle-plugin.failOnViolation>false
 		</maven-checkstyle-plugin.failOnViolation>
-		<maven-checkstyle-plugin.includeTestSourceDirectory>true
+		<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.nohttp.file>
-			https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/nohttp-checkstyle.xml
-		</checkstyle.nohttp.file>
 		<checkstyle.additional.suppressions.file>
 			${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
 		</checkstyle.additional.suppressions.file>
-		<nohttp-checkstyle.version>0.0.2.RELEASE</nohttp-checkstyle.version>
-		<disable.nohttp.checks>true</disable.nohttp.checks>
-		<antelopetasks.version>3.2.10</antelopetasks.version>
-		<ant-nodeps.version>1.8.1</ant-nodeps.version>
-		<configprops.path>${project.basedir}/src/main/asciidoc/_configprops.adoc</configprops.path>
-		<configprops.inclusionPattern>.*</configprops.inclusionPattern>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -189,17 +169,10 @@
 				<role>developer</role>
 			</roles>
 		</developer>
-		<developer>
-			<id>omaciaszeksharma</id>
-			<name>Olga Maciaszek-Sharma</name>
-			<email>omaciaszeksharma at pivotal.io</email>
-			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>https://www.spring.io</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
 	</developers>
+	<prerequisites>
+		<maven>3.0.0</maven>
+	</prerequisites>
 	<build>
 		<!-- Turn on filtering by default for application properties -->
 		<resources>
@@ -420,11 +393,6 @@
 							<artifactId>spring-cloud-build-tools</artifactId>
 							<version>${spring-cloud-build.version}</version>
 						</dependency>
-						<dependency>
-							<groupId>io.spring.nohttp</groupId>
-							<artifactId>nohttp-checkstyle</artifactId>
-							<version>${nohttp-checkstyle.version}</version>
-						</dependency>
 					</dependencies>
 					<executions>
 						<execution>
@@ -455,21 +423,6 @@
 								<goal>check</goal>
 							</goals>
 						</execution>
-						<execution>
-							<id>no-http-checkstyle-validation</id>
-							<phase>validate</phase>
-							<inherited>true</inherited>
-							<configuration>
-								<skip>${disable.nohttp.checks}</skip>
-								<configLocation>${checkstyle.nohttp.file}</configLocation>
-								<includes>**/*</includes>
-								<excludes>**/.idea/**/*,**/.git/**/*,**/target/**/*,**/*.log</excludes>
-								<sourceDirectories>./</sourceDirectories>
-							</configuration>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
 					</executions>
 				</plugin>
 				<plugin>
@@ -490,7 +443,6 @@
 						<generateGitPropertiesFilename>
 							${project.build.outputDirectory}/git.properties
 						</generateGitPropertiesFilename>
-						<skipPoms>false</skipPoms>
 					</configuration>
 				</plugin>
 				<!-- Support our own plugin -->
@@ -617,50 +569,9 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>${maven-javadoc-plugin.version}</version>
-					<executions>
-						<execution>
-							<id>aggregate</id>
-							<goals>
-								<goal>aggregate</goal>
-							</goals>
-							<phase>site</phase>
-						</execution>
-					</executions>
-				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>${maven-javadoc-plugin.version}</version>
-				<reportSets>
-					<reportSet>
-						<id>non-aggregate</id>
-						<configuration>
-						</configuration>
-						<reports>
-							<report>javadoc</report>
-						</reports>
-					</reportSet>
-					<reportSet>
-						<id>aggregate</id>
-						<configuration>
-						</configuration>
-						<reports>
-							<report>aggregate</report>
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
@@ -711,11 +622,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-plugins</id>
-					<name>Spring Maven Plugins Repository</name>
-					<url>https://repo.spring.io/plugins-release</url>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -790,65 +696,6 @@
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>guides</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<version>${maven-dependency-plugin.version}</version>
-						<executions>
-							<execution>
-								<id>unpack-docs</id>
-								<phase>generate-resources</phase>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.springframework.cloud
-											</groupId>
-											<artifactId>spring-cloud-build-docs
-											</artifactId>
-											<version>${spring-cloud-build.version}
-											</version>
-											<classifier>sources</classifier>
-											<type>jar</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${docs.resources.dir}
-											</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>exec-maven-plugin</artifactId>
-						<groupId>org.codehaus.mojo</groupId>
-						<executions>
-							<execution>
-								<id>Run guides update</id>
-								<phase>${guides-update.phase}</phase>
-								<goals>
-									<goal>exec</goal>
-								</goals>
-								<configuration>
-									<skip>${skipGuides}</skip>
-									<workingDirectory>${maven.multiModuleProjectDirectory}</workingDirectory>
-									<executable>${docs.resources.dir}/asciidoc/update-guides.sh</executable>
-									<environmentVariables>
-										<PROJECT_VERSION>${guides-project.version}</PROJECT_VERSION>
-									</environmentVariables>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 		<profile>
 			<id>java8</id>
 			<activation>
@@ -942,93 +789,15 @@
 												</version>
 												<classifier>sources</classifier>
 												<type>jar</type>
-												<overWrite>true</overWrite>
+												<overWrite>false</overWrite>
 												<outputDirectory>${docs.resources.dir}
 												</outputDirectory>
 											</artifactItem>
 										</artifactItems>
 									</configuration>
 								</execution>
-								<execution>
-									<id>unpack-docs-resources</id>
-									<phase>generate-resources</phase>
-									<goals>
-										<goal>unpack</goal>
-									</goals>
-									<configuration>
-										<artifactItems>
-											<artifactItem>
-												<groupId>io.spring.docresources</groupId>
-												<artifactId>spring-doc-resources</artifactId>
-												<version>${spring-doc-resources.version}</version>
-												<type>zip</type>
-												<overWrite>true</overWrite>
-												<outputDirectory>${refdocs.build.directory}</outputDirectory>
-											</artifactItem>
-										</artifactItems>
-									</configuration>
-								</execution>
 							</executions>
 						</plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-resources-plugin</artifactId>
-							<executions>
-								<execution>
-									<id>copy-asciidoc-resources</id>
-									<phase>generate-resources</phase>
-									<goals>
-										<goal>copy-resources</goal>
-									</goals>
-									<configuration>
-										<outputDirectory>${project.build.directory}/refdocs/</outputDirectory>
-										<resources>
-											<resource>
-												<directory>src/main/asciidoc</directory>
-												<excludes>
-													<exclude>ghpages.sh</exclude>
-												</excludes>
-											</resource>
-										</resources>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>exec-maven-plugin</artifactId>
-							<version>${exec-maven-plugin.version}</version>
-							<executions>
-								<execution>
-									<id>generate-configprops</id>
-									<phase>prepare-package</phase>
-									<goals>
-										<goal>java</goal>
-									</goals>
-								</execution>
-							</executions>
-							<dependencies>
-								<dependency>
-									<groupId>org.springframework.cloud
-									</groupId>
-									<artifactId>spring-cloud-build-docs
-									</artifactId>
-									<version>${spring-cloud-build.version}
-									</version>
-									<type>jar</type>
-								</dependency>
-							</dependencies>
-							<configuration>
-								<includePluginDependencies>
-									true
-								</includePluginDependencies>
-								<mainClass>org.springframework.cloud.internal.Main</mainClass>
-								<arguments>
-									<argument>${configprops.path}</argument>
-									<argument>${configprops.inclusionPattern}</argument>
-								</arguments>
-							</configuration>
-						</plugin>
 						<plugin>
 							<groupId>org.asciidoctor</groupId>
 							<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -1037,159 +806,171 @@
 								<dependency>
 									<groupId>io.spring.asciidoctor</groupId>
 									<artifactId>spring-asciidoctor-extensions</artifactId>
-									<version>${spring-asciidoctor-extensions.version}</version>
-								</dependency>
-								<dependency>
-									<groupId>org.asciidoctor</groupId>
-									<artifactId>asciidoctorj-pdf</artifactId>
-									<version>${asciidoctorj-pdf.version}</version>
-								</dependency>
-								<dependency>
-									<groupId>org.asciidoctor</groupId>
-									<artifactId>asciidoctorj-diagram</artifactId>
-									<version>${asciidoctorj-diagram.version}</version>
+									<version>0.1.0.RELEASE</version>
 								</dependency>
 							</dependencies>
-							<configuration>
-								<sourceDirectory>${refdocs.build.directory}</sourceDirectory>
-								<resources>
-									<resource>
-										<directory>${refdocs.build.directory}</directory>
-										<excludes>
-											<exclude>**/*.*adoc</exclude>
-										</excludes>
-									</resource>
-								</resources>
-								<!-- tag::attributes[] -->
-								<attributes>
-									<docinfo>shared</docinfo>
-									<allow-uri-read>true</allow-uri-read>
-									<nofooter/>
-									<toc>left</toc>
-									<toc-levels>4</toc-levels>
-									<sectlinks>true</sectlinks>
-									<sources-root>${project.basedir}/src</sources-root>
-									<asciidoc-sources-root>${project.basedir}/src/main/asciidoc</asciidoc-sources-root>
-									<generated-resources-root>${project.basedir}/target/generated-resources
-									</generated-resources-root>
-									<!-- Use this attribute the reference code from another module -->
-									<project-root>${maven.multiModuleProjectDirectory}</project-root>
-									<!-- It's mandatory for you to pass the docs.main property -->
-									<github-repo>${docs.main}</github-repo>
-									<github-raw>
-										https://raw.githubusercontent.com/spring-cloud/${docs.main}/${github-tag}
-									</github-raw>
-									<github-code>https://github.com/spring-cloud/${docs.main}/tree/${github-tag}
-									</github-code>
-									<github-issues>https://github.com/spring-cloud/${docs.main}/issues/</github-issues>
-									<github-wiki>https://github.com/spring-cloud/${docs.main}/wiki</github-wiki>
-									<github-master-code>https://github.com/spring-cloud/${docs.main}/tree/master
-									</github-master-code>
-									<index-link>${index-link}</index-link>
-
-									<!-- Spring Cloud specific -->
-									<!-- for backward compatibility -->
-									<spring-cloud-version>${project.version}</spring-cloud-version>
-									<project-version>${project.version}</project-version>
-									<github-tag>${github-tag}</github-tag>
-									<version-type>${version-type}</version-type>
-									<docs-url>${docs-url}</docs-url>
-									<raw-docs-url>${raw-docs-url}</raw-docs-url>
-									<project-version>${project.version}</project-version>
-									<project-name>${docs.main}</project-name>
-								</attributes>
-								<!-- end::attributes[] -->
-								<requires>
-									<require>asciidoctor-diagram</require>
-								</requires>
-							</configuration>
 							<executions>
 								<execution>
-									<id>generate-html-documentation</id>
+									<id>generate-docbook</id>
 									<phase>prepare-package</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
-										<sourceDocumentExtensions>
-											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
-											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
-										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/html
-										</outputDirectory>
-										<sourceHighlighter>highlight.js</sourceHighlighter>
+										<sourceDocumentName>${docs.main}.adoc
+										</sourceDocumentName>
+										<backend>docbook5</backend>
 										<doctype>book</doctype>
 										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
-											<stylesdir>css/</stylesdir>
-											<stylesheet>spring.css</stylesheet>
-											<attribute-missing>warn</attribute-missing>
-										</attributes>
-										<logHandler>
-											<outputToConsole>true</outputToConsole>
-											<failIf>
-												<!--												<severity>DEBUG</severity>-->
-											</failIf>
-										</logHandler>
-									</configuration>
-								</execution>
-								<execution>
-									<id>generate-htmlsingle-documentation</id>
-									<phase>prepare-package</phase>
-									<goals>
-										<goal>process-asciidoc</goal>
-									</goals>
-									<configuration>
-										<backend>html5</backend>
-										<sourceDocumentExtensions>
-											<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
-										</sourceDocumentExtensions>
-										<outputDirectory>
-											${project.build.directory}/generated-docs/reference/htmlsingle
-										</outputDirectory>
-										<sourceHighlighter>highlight.js</sourceHighlighter>
-										<doctype>book</doctype>
-										<attributes>
-											<highlightjsdir>js/highlight</highlightjsdir>
-											<highlightjs-theme>atom-one-dark-reasonable</highlightjs-theme>
-											<linkcss>true</linkcss>
-											<imagesdir>./images</imagesdir>
-											<icons>font</icons>
-											<stylesdir>css/</stylesdir>
-											<stylesheet>spring.css</stylesheet>
+											<docinfo>true</docinfo>
+											<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>
 									</configuration>
 								</execution>
 								<execution>
-									<id>generate-pdf-documentation</id>
-									<phase>prepare-package</phase>
+									<id>generate-index</id>
+									<phase>process-resources</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>pdf</backend>
-										<sourceDocumentExtensions>
-											<sourceDocumentExtension>.pdfadoc</sourceDocumentExtension>
-										</sourceDocumentExtensions>
-										<outputDirectory>${project.build.directory}/generated-docs/reference/pdf
-										</outputDirectory>
-										<resources>
-											<resource>
-												<directory>${refdocs.build.directory}</directory>
-												<excludes>
-													<exclude>**/*</exclude>
-												</excludes>
-											</resource>
-										</resources>
+										<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>
+											<allow-uri-read>true</allow-uri-read>
+											<safe-mode>unsafe</safe-mode>
+											<source-highlighter>prettify
+											</source-highlighter>
+											<docs-main>${docs.main}</docs-main>
+										</attributes>
 									</configuration>
 								</execution>
 							</executions>
 						</plugin>
+						<plugin>
+							<groupId>com.agilejava.docbkx</groupId>
+							<artifactId>docbkx-maven-plugin</artifactId>
+							<version>${docbkx-maven-plugin.version}</version>
+							<configuration>
+								<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>
+								<useExtensions>1</useExtensions>
+								<highlightSource>1</highlightSource>
+								<highlightXslthlConfig>
+									${docs.resources.dir}/docbook/xsl/xslthl-config.xml
+								</highlightXslthlConfig>
+							</configuration>
+							<dependencies>
+								<dependency>
+									<groupId>net.sf.xslthl</groupId>
+									<artifactId>xslthl</artifactId>
+									<version>2.1.0</version>
+								</dependency>
+								<dependency>
+									<groupId>net.sf.docbook</groupId>
+									<artifactId>docbook-xml</artifactId>
+									<version>5.0-all</version>
+									<classifier>resources</classifier>
+									<type>zip</type>
+									<scope>runtime</scope>
+								</dependency>
+							</dependencies>
+							<executions>
+								<execution>
+									<id>html-single</id>
+									<goals>
+										<goal>generate-html</goal>
+									</goals>
+									<phase>prepare-package</phase>
+									<configuration>
+										<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>
+											</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>
+											</copy>
+										</postProcess>
+									</configuration>
+								</execution>
+								<execution>
+									<id>html</id>
+									<goals>
+										<goal>generate-html</goal>
+									</goals>
+									<phase>prepare-package</phase>
+									<configuration>
+										<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>
+										<chunkedOutput>true</chunkedOutput>
+										<postProcess>
+											<copy todir="${basedir}/target/contents/reference/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>
+											</copy>
+										</postProcess>
+									</configuration>
+								</execution>
+							</executions>
+						</plugin>
+						<plugin>
+							<groupId>org.codehaus.mojo</groupId>
+							<artifactId>build-helper-maven-plugin</artifactId>
+							<version>${build-helper-maven-plugin.version}</version>
+							<inherited>false</inherited>
+						</plugin>
 						<plugin>
 							<groupId>org.apache.maven.plugins</groupId>
 							<artifactId>maven-antrun-plugin</artifactId>
@@ -1209,22 +990,22 @@
 								<dependency>
 									<groupId>org.apache.ant</groupId>
 									<artifactId>ant-nodeps</artifactId>
-									<version>${ant-nodeps.version}</version>
+									<version>1.8.1</version>
 								</dependency>
 								<dependency>
 									<groupId>org.tigris.antelope</groupId>
 									<artifactId>antelopetasks</artifactId>
-									<version>${antelopetasks.version}</version>
+									<version>3.2.10</version>
 								</dependency>
 								<dependency>
 									<groupId>org.jruby</groupId>
 									<artifactId>jruby-complete</artifactId>
-									<version>${jruby-complete.version}</version>
+									<version>1.7.17</version>
 								</dependency>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
 									<artifactId>asciidoctorj</artifactId>
-									<version>${asciidoctorj.version}</version>
+									<version>1.5.2</version>
 								</dependency>
 							</dependencies>
 							<executions>
@@ -1245,6 +1026,75 @@
 										</target>
 									</configuration>
 								</execution>
+								<execution>
+									<id>copy-css</id>
+									<phase>process-resources</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<target>
+											<copy todir="${basedir}/target/generated-docs/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>
+										</target>
+									</configuration>
+								</execution>
+								<execution>
+									<id>generate-documentation-index</id>
+									<phase>generate-resources</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<target>
+											<!-- @formatter:off -->
+											<!-- @checkstyle:off -->
+											<echo file="${basedir}/target/generated-index/${docs.main}.adoc">
+:nofooter:
+:linkcss:
+:stylesdir: css
+:stylesheet: manual-singlepage.css
+
+= {docs-main}
+
+{spring-cloud-version}
+
+== Pick The Documentation Option
+
+- link:single/{docs-main}.html[Single HTML]
+- link:multi/multi_{docs-main}.html[Multi HTML]
+											</echo>
+											<!-- @checkstyle:on -->
+											<!-- @formatter:on -->
+										</target>
+									</configuration>
+								</execution>
+								<execution>
+									<id>copy-generated-html</id>
+									<phase>prepare-package</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<target>
+											<copy todir="${basedir}/target/generated-docs/single">
+												<fileset
+														dir="${basedir}/target/contents/reference/htmlsingle"/>
+											</copy>
+											<copy todir="${basedir}/target/generated-docs/multi">
+												<fileset
+														dir="${basedir}/target/contents/reference/html"/>
+											</copy>
+										</target>
+									</configuration>
+								</execution>
 								<execution>
 									<id>assert-no-unresolved-links</id>
 									<phase>prepare-package</phase>
@@ -1253,7 +1103,8 @@
 									</goals>
 									<configuration>
 										<target>
-											<fileset id="unresolved.file" dir="${basedir}/target/generated-docs/"
+											<fileset id="unresolved.file"
+													 dir="${basedir}/target/contents/reference/"
 													 includes="**/*.html">
 												<contains text="Unresolved"/>
 											</fileset>
@@ -1267,116 +1118,57 @@
 										</target>
 									</configuration>
 								</execution>
-								<execution>
-									<id>package-and-attach-docs-zip</id>
-									<phase>package</phase>
-									<goals>
-										<goal>run</goal>
-									</goals>
-									<configuration>
-										<target>
-											<zip
-													destfile="${project.build.directory}/${project.artifactId}-${revision}.zip">
-												<!--<zipfileset
-														src="${project.build.directory}/${project.artifactId}-${revision}-javadoc.jar"
-														prefix="api" />-->
-												<!--												<fileset dir="${project.build.directory}/contents"/>-->
-												<fileset dir="${project.build.directory}/generated-docs"/>
-											</zip>
-										</target>
-									</configuration>
-								</execution>
 								<execution>
 									<id>setup-maven-properties</id>
-									<phase>initialize</phase>
+									<phase>validate</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
 									<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="${revision}"/>
-											<propertyregex property="version-type" override="true"
-														   input="${version-type}" regexp=".*\.(.*)" replace="\1"/>
-											<propertyregex property="version-type" override="true"
-														   input="${version-type}" regexp="(M)\d+" replace="MILESTONE"/>
-											<propertyregex property="version-type" override="true"
-														   input="${version-type}" regexp="(RC)\d+"
+											<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"/>
+											<propertyregex property="version-type"
+														   override="true"
+														   input="${version-type}"
+														   regexp="(M)\d+"
 														   replace="MILESTONE"/>
-											<propertyregex property="version-type" override="true"
-														   input="${version-type}" regexp="BUILD-(.*)"
+											<propertyregex property="version-type"
+														   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">
+											<stringutil string="${version-type}"
+														property="spring-cloud-repo">
 												<lowercase/>
 											</stringutil>
-											<propertyregex property="git.branch" override="true"
-														   input="${git.branch}" regexp="origin/(.*)"
-														   replace="\1"/>
-											<var name="github-tag" value="${git.branch}"/>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<or>
-														<equals arg1="${git.branch}" arg2="master"/>
-														<equals arg1="${git.branch}" arg2="origin/master"/>
-													</or>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/${docs.main}/${git.branch}">
-												<and>
-													<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													<not>
-														<or>
-															<equals arg1="${git.branch}" arg2="master"/>
-															<equals arg1="${git.branch}" arg2="origin/master"/>
-														</or>
-													</not>
-												</and>
-											</condition>
-											<condition property="docs-url"
-													   value="https://cloud.spring.io/spring-cloud-static/${docs.main}/${project.version}">
-												<and>
-													<not>
-														<equals arg1="${version-type}" arg2="SNAPSHOT"/>
-													</not>
-												</and>
-											</condition>
-											<propertyregex property="raw-docs-url" override="true"
-														   input="${docs-url}" regexp="https://cloud.spring.io/(.*)"
-														   replace="https://raw.githubusercontent.com/\1"/>
+											<var name="github-tag"
+												 value="v${project.version}"/>
+											<propertyregex property="github-tag"
+														   override="true"
+														   input="${github-tag}"
+														   regexp=".*SNAPSHOT"
+														   replace="master"/>
 										</target>
 									</configuration>
 								</execution>
 							</executions>
 						</plugin>
-						<plugin>
-							<groupId>org.codehaus.mojo</groupId>
-							<artifactId>build-helper-maven-plugin</artifactId>
-							<version>${build-helper-maven-plugin.version}</version>
-							<inherited>false</inherited>
-							<executions>
-								<execution>
-									<id>attach-zip</id>
-									<goals>
-										<goal>attach-artifact</goal>
-									</goals>
-									<configuration>
-										<artifacts>
-											<artifact>
-												<file>
-													${project.build.directory}/${project.artifactId}-${project.version}.zip
-												</file>
-												<type>zip</type>
-											</artifact>
-										</artifacts>
-									</configuration>
-								</execution>
-							</executions>
-						</plugin>
 						<plugin>
 							<groupId>org.jfrog.buildinfo</groupId>
 							<artifactId>artifactory-maven-plugin</artifactId>

spring-cloud-build-dependencies/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.2.0.M6</version>
+	<version>2.1.6.RELEASE</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,13 +14,28 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.2.0.RC1</version>
+		<version>2.1.6.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.2.0.RC1</spring-boot.version>
+		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
 	</properties>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-core</artifactId>
+				<version>${spring.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>

spring-cloud-build-tools/pom.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
+<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 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>
 	<name>spring-cloud-build-tools</name>
 	<packaging>jar</packaging>
@@ -10,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.2.0.M6</version>
+		<version>2.1.6.RELEASE</version>
 	</parent>
 	<dependencies>
 		<dependency>

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

@@ -1,29 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2002-2019 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-
-	<!-- Configure checker to use UTF-8 encoding -->
-	<property name="charset" value="UTF-8"/>
-	<!-- Configure checker to run on files with these extensions -->
-	<property name="fileExtensions" value=""/>
-	<!-- For detailed checkstyle configuration, see https://github.com/spring-io/nohttp/tree/master/nohttp-checkstyle -->
-	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
-	</module>
-</module>

spring-cloud-dependencies-parent/pom.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.2.0.M6</version>
+	<version>2.1.6.RELEASE</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -25,7 +24,7 @@
 				you may not use this file except in compliance with the License.
 				You may obtain a copy of the License at
 
-				https://www.apache.org/licenses/LICENSE-2.0
+	            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,