Update SNAPSHOT to 3.1.10

This reverts commit 4bea4c590f.

.circleci/config.yml

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

.editorconfig

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+Please provide details of the problem, including the version of Spring Cloud that you
+are using. 
+
+**Sample**
+If possible, please provide a test case or sample application that reproduces
+the problem. This makes it much easier for us to diagnose the problem and to verify that
+we have fixed it.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/maven.yml

@@ -0,0 +1,35 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Build
+
+on:
+  push:
+    branches: [ main, 3.1.x ]
+  pull_request:
+    branches: [ main, 3.1.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        java: ["8", "11", "16"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Build with Maven
+        run: ./mvnw clean install -B -U -Pspring

.gitignore

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

.gitmodules

@@ -0,0 +1,6 @@
+[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

.mvn/maven.config

@@ -1 +1 @@
--DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring
+-P spring

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present 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
+ *
+ *      http://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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1,2 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.sdkmanrc

@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.292.hs-adpt

.settings.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2018 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.
+  -->
+
 <settings>
 	<servers>
 		<server>
@@ -23,7 +39,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -31,7 +47,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -49,7 +65,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -57,12 +73,21 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
+		<profile>
+			<!--
+				Turns on jdk8 for tests
+			-->
+			<id>ide</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
 	</profiles>
 </settings>

README.adoc

@@ -4,7 +4,8 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////
 
-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]
 
 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -21,13 +22,13 @@ $ mvn install -s .settings.xml
 and to deploy snapshots to repo.spring.io:
 
 ----
-$ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
+$ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot
 ----
 
 for a RELEASE build use
 
 ----
-$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-release-local
+$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/release
 ----
 
 and for jcenter use
@@ -46,7 +47,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
 
 == Contributing
 
-:spring-cloud-build-branch: master
+:spring-cloud-build-branch: 3.1.x
 
 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
@@ -63,7 +64,7 @@ author credit if we do.  Active contributors might be asked to join the core tea
 given the ability to merge pull requests.
 
 === Code of Conduct
-This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/3.1.x/docs/src/main/asciidoc/code-of-conduct.adoc[code of
 conduct]. By participating, you  are expected to uphold this code. Please report
 unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
@@ -74,7 +75,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
   you can import formatter settings using the
   `eclipse-code-formatter.xml` file from the
-  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
+  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
   Cloud Build] project. If using IntelliJ, you can use the
   https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
   Plugin] to import the same file.
@@ -170,7 +171,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
 It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
 
 ```bash
-$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/.editorconfig -o .editorconfig
 $ touch .springformat
 ```
 
@@ -179,6 +180,7 @@ $ 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/3.1.x/spring-cloud-build-tools[Spring Cloud Build] project.
 
 .spring-cloud-build-tools/
 ----
@@ -217,14 +219,83 @@ To have Intellij work with Checkstyle, you have to install the `Checkstyle` plug
 
 image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
 
-Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+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/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
 
-- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
-- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.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/3.1.x/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/3.1.x/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.
 
+=== Duplicate Finder
+
+Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
+
+==== Duplicate Finder configuration
+
+Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
+
+.pom.xml
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+</build>
+----
+
+For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
+
+You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
+
+If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
+
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+            <configuration>
+                <ignoredClassPatterns>
+                    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
+                    <ignoredClassPattern>.*module-info</ignoredClassPattern>
+                </ignoredClassPatterns>
+                <ignoredResourcePatterns>
+                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
+                </ignoredResourcePatterns>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+
+
+----
+
+
+== Flattening the POMs
+
+To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+
+In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
+
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>flatten-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+</build>
+----
+
 == Reusing the documentation
 
 Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
@@ -234,31 +305,134 @@ approach of generating documentation just add these plugins to your `docs` modul
 
 [source,xml]
 ----
+<properties>
+    <upload-docs-zip.phase>deploy</upload-docs-zip.phase> <8>
+</properties>
 <profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <1>
-					</plugin>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <3>
-						<inherited>false</inherited>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+    <profile>
+        <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>
+                </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId> <5>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId> <6>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId> <7>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+</profiles>
 ----
-<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
+<1> 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
+<7> This plugin ensures that the generated zip docs will get published
+<8> This property turns on the "deploy" phase for <7>
 
-IMPORTANT: The order of plugin declaration is important!
+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 -->
+    <!-- Note the @ at the end, lowering the precedence of the attribute -->
+    <project-root>${maven.multiModuleProjectDirectory}@</project-root>
+    <!-- It's mandatory for you to pass the docs.main property -->
+    <github-repo>${docs.main}@</github-repo>
+    <github-project>https://github.com/spring-cloud/${docs.main}@</github-project>
+    <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>https://docs.spring.io/${docs.main}/docs/${project.version}@</docs-url>
+    <raw-docs-url>${github-raw}@</raw-docs-url>
+    <project-version>${project.version}@</project-version>
+    <project-name>${docs.main}@</project-name>
+    <source-highlighter>highlight.js</source-highlighter>
+</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`).

circle.yml

@@ -1,20 +0,0 @@
-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)

config/releaser.yml

@@ -0,0 +1,4 @@
+releaser:
+  maven:
+    buildCommand: ./scripts/build.sh  {{systemProps}}
+#    deployCommand: echo "skip deploy"

docs/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-build-docs</artifactId>
 	<name>spring-cloud-build-docs</name>
@@ -9,25 +10,85 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.6.RELEASE</version>
+		<version>3.1.10</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>
-		<docs.resources.dir>${basedir}/src/main</docs.resources.dir>
+		<!-- We don't want to downloaded sources of our own project-->
+		<maven-dependency-plugin-for-docs.phase>none</maven-dependency-plugin-for-docs.phase>
+		<maven-dependency-plugin-for-docs-classes.phase>none</maven-dependency-plugin-for-docs-classes.phase>
+		<docs.resources.dir>${project.basedir}/src/main/</docs.resources.dir>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
+		<!-- Don't upload docs jar to central / repo.spring.io -->
+		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
+		<!-- We don't want to reference plugin classpath of ourselves -->
+		<readme.class.path>maven.compile.classpath</readme.class.path>
+		<spring-cloud-build-docs-classifier></spring-cloud-build-docs-classifier>
 	</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>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<!-- Asciidoctor -->
+		<dependency>
+			<groupId>org.asciidoctor</groupId>
+			<artifactId>asciidoctorj</artifactId>
+			<version>${asciidoctorj.version}</version>
+			<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>java/**/*.*</exclude>
+				</excludes>
 			</resource>
 		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.3.0</version>
+				<configuration>
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
+				<version>${maven-deploy-plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
@@ -36,18 +97,37 @@
 			<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>
 					</plugin>
+					<plugin>
+						<artifactId>maven-deploy-plugin</artifactId>
+						<goals>
+							<goal>deploy</goal>
+							<goal>deploy-file</goal>
+						</goals>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

docs/src/main/.gitignore

@@ -0,0 +1,2 @@
+META-INF/
+org/

docs/src/main/asciidoc/README.adoc

@@ -1,4 +1,4 @@
-image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-build/actions"]
 
 Spring Cloud Build is a common utility project for Spring Cloud
 to use for plugin and dependency management.
@@ -15,13 +15,13 @@ $ mvn install -s .settings.xml
 and to deploy snapshots to repo.spring.io:
 
 ----
-$ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
+$ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot
 ----
 
 for a RELEASE build use
 
 ----
-$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-release-local
+$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/release
 ----
 
 and for jcenter use
@@ -40,7 +40,25 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:
 
 == Contributing
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[]
+
+== Flattening the POMs
+
+To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+
+In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
+
+[source,xml]
+----
+<build>
+	<plugins>
+		<plugin>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>flatten-maven-plugin</artifactId>
+		</plugin>
+	</plugins>
+</build>
+----
 
 == Reusing the documentation
 
@@ -51,31 +69,95 @@ approach of generating documentation just add these plugins to your `docs` modul
 
 [source,xml]
 ----
+<properties>
+	<upload-docs-zip.phase>deploy</upload-docs-zip.phase> <8>
+</properties>
 <profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId> <1>
-					</plugin>
-					<plugin>
-						<groupId>org.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId> <2>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-antrun-plugin</artifactId> <3>
-						<inherited>false</inherited>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+	<profile>
+		<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>
+				</plugin>
+				<plugin>
+					<groupId>org.asciidoctor</groupId>
+					<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId> <6>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId> <7>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+</profiles>
 ----
-<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
+<1> 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
+<7> This plugin ensures that the generated zip docs will get published
+<8> This property turns on the "deploy" phase for <7>
 
-IMPORTANT: The order of plugin declaration is important!
+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/3.1.x/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`).

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

@@ -22,23 +22,9 @@ the `.mvn` configuration, so if you find you have to do it to make a
 build succeed, please raise a ticket to get the settings added to
 source control.
 
-For hints on how to build the project look in `.travis.yml` if there
-is one. There should be a "script" and maybe "install" command. Also
-look at the "services" section to see if any services need to be
-running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they're related to setting git
-credentials and you already have those.
+The projects that require middleware (i.e. Redis) for testing generally
+require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
 
-The projects that require middleware generally include a
-`docker-compose.yml`, so consider using
-https://docs.docker.com/compose/[Docker Compose] to run the middeware servers
-in Docker containers. See the README in the
-https://github.com/spring-cloud-samples/scripts[scripts demo
-repository] for specific instructions about the common cases of mongo,
-rabbit and redis.
-
-NOTE: If all else fails, build with the command from `.travis.yml` (usually
-`./mvnw install`).
 
 === Documentation
 
@@ -58,6 +44,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the
 https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.
 
+==== Activate the Spring Maven profile
+Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
+the spring milestone and snapshot repositories. Use your preferred IDE to set this
+profile to be active, or you may experience build errors.
+
 ==== Importing into eclipse with m2eclipse
 We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse

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

@@ -1,4 +1,4 @@
 :jdkversion: 1.8
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-base.adoc[]
 

docs/src/main/asciidoc/building.adoc

@@ -1,3 +1,3 @@
-:jdkversion: 1.7
+:jdkversion: 1.8
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-base.adoc[]

docs/src/main/asciidoc/contributing-docs.adoc

@@ -1 +1 @@
-NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {docslink}[github].
+NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {github-project}[github].

docs/src/main/asciidoc/contributing.adoc

@@ -1,4 +1,4 @@
-:spring-cloud-build-branch: master
+:spring-cloud-build-branch: 3.1.x
 
 Spring Cloud is released under the non-restrictive Apache 2.0 license,
 and follows a very standard Github development process, using Github
@@ -15,7 +15,7 @@ author credit if we do.  Active contributors might be asked to join the core tea
 given the ability to merge pull requests.
 
 === Code of Conduct
-This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/3.1.x/docs/src/main/asciidoc/code-of-conduct.adoc[code of
 conduct]. By participating, you  are expected to uphold this code. Please report
 unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
@@ -26,7 +26,7 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
   you can import formatter settings using the
   `eclipse-code-formatter.xml` file from the
-  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
+  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
   Cloud Build] project. If using IntelliJ, you can use the
   https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
   Plugin] to import the same file.
@@ -122,7 +122,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
 It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
 
 ```bash
-$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/.editorconfig -o .editorconfig
 $ touch .springformat
 ```
 
@@ -131,6 +131,7 @@ $ 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/3.1.x/spring-cloud-build-tools[Spring Cloud Build] project.
 
 .spring-cloud-build-tools/
 ----
@@ -169,10 +170,61 @@ To have Intellij work with Checkstyle, you have to install the `Checkstyle` plug
 
 image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
 
-Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+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/3.1.x/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
 
-- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
-- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.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/3.1.x/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/3.1.x/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.
+
+=== Duplicate Finder
+
+Spring Cloud Build brings along the  `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath.
+
+==== Duplicate Finder configuration
+
+Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`.
+
+.pom.xml
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+</build>
+----
+
+For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation].
+
+You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build.
+
+If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project:
+
+[source,xml]
+----
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.basepom.maven</groupId>
+            <artifactId>duplicate-finder-maven-plugin</artifactId>
+            <configuration>
+                <ignoredClassPatterns>
+				    <ignoredClassPattern>org.joda.time.base.BaseDateTime</ignoredClassPattern>
+					<ignoredClassPattern>.*module-info</ignoredClassPattern>
+				</ignoredClassPatterns>
+                <ignoredResourcePatterns>
+                    <ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
+                </ignoredResourcePatterns>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+
+
+----
+

docs/src/main/asciidoc/ghpages.sh

@@ -1,15 +1,45 @@
-#!/bin/bash -x
+#!/bin/bash
 
 # 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}"
+
+cat <<EOF
+
+
+
+
+!!! WARNING !!!
+
+THIS SCRIPT IS DEPRECATED!!
+We're migrating away from using gh-pages at all. We're moving to using docs.spring.io and the zipped documentation.
+Please migrate to the new approach as soon as possible since this script will be removed soon.
+
+!!! WARNING !!!
+
+
+
+
+EOF
+
+
+# The script should be run 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
@@ -24,8 +54,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 remote -v | grep origin | head -1 | sed -e 's!.*/!!' -e 's/ .*//' -e 's/\.git.*//')
+    if [ -z "${REPO_NAME}" ]; then
+        REPO_NAME="$("${GIT_BIN}" 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}
@@ -34,22 +64,32 @@ function set_default_props() {
 
 # Adds the oauth token if present to the remote url
 function add_oauth_token_to_remote_url() {
-    remote=`git config remote.origin.url | sed -e 's/^git:/https:/'`
+    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"
+    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
         withToken=${remote/https:\/\//https://${RELEASER_GIT_OAUTH_TOKEN}@}
-        git remote set-url --push origin "${withToken}"
+        echo "OAuth token found. Will reuse it to push the code to [${withToken}]"
+        "${GIT_BIN}" remote set-url --push origin "${withToken}"
     else
-        echo "No OAuth token found"
-        git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+        echo "No OAuth token found. Will push to [${remote}]"
+        "${GIT_BIN}" remote set-url --push origin "${remote}"
     fi
 }
 
 # Check if gh-pages exists and docs have been built
 function check_if_anything_to_sync() {
     add_oauth_token_to_remote_url
-    if ! (git remote set-branches --add origin gh-pages && git fetch -q) && [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
+    if [[ "${RELEASE_TRAIN}" != "yes" ]] && ! ("${GIT_BIN}" remote set-branches --add origin gh-pages && "${GIT_BIN}" fetch -q) ; then
         echo "No gh-pages, so not syncing"
         exit 0
     fi
@@ -66,19 +106,22 @@ 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 symbolic-ref -q HEAD)
+      CURRENT_BRANCH=$("${GIT_BIN}" symbolic-ref -q HEAD)
       CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
       CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
     fi
     echo "Current branch is [${CURRENT_BRANCH}]"
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-    PREVIOUS_BRANCH=${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}]"
 }
 
 # 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 checkout v${VERSION}
+        "${GIT_BIN}" checkout v"${VERSION}"
+    else
+        echo "Not switching to tag"
     fi
 }
 
@@ -86,74 +129,87 @@ 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
+# Get allowed branches - assumes that a `docs` module is available under `docs` profile
+# shellcheck disable=SC2016
 function retrieve_doc_properties() {
-    MAIN_ADOC_VALUE=$("${MAVEN_EXEC}" -q \
+    if [[ "${RELEASE_TRAIN}" == "yes" ]]; then
+        echo "Will not extract any properties for release train"
+        return
+    fi
+
+
+    ALLOW_PROPERTY=${ALLOW_PROPERTY:-"docs.allowed.branches"}
+    ALLOWED_BRANCHES_VALUE=$("${MAVEN_EXEC}" -q \
         -Dexec.executable="echo" \
-        -Dexec.args='${docs.main}' \
+        -Dexec.args="\${${ALLOW_PROPERTY}}" \
         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"}
-    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_EXEC}" -q \
-        -Dexec.executable="echo" \
-        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-        -P docs \
-        -pl docs | tail -1 )
-    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
+    echo "Extracted '${ALLOW_PROPERTY}' from Maven build [${ALLOWED_BRANCHES_VALUE}]"
 }
 
 # Stash any outstanding changes
 function stash_changes() {
-    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
+    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
 }
 
 # 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=${ROOT_FOLDER}/target/spring-cloud-static
+        mkdir -p "${ROOT_FOLDER}"/target
+        local clonedStatic="${SPRING_CLOUD_STATIC_REPO_DESTINATION}"/spring-cloud-static
         if [[ ! -e "${clonedStatic}/.git" ]]; then
-            echo "Cloning Spring Cloud Static to target"
-            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && cd ${clonedStatic} && git checkout gh-pages
+            echo "Cloning Spring Cloud Static to [${clonedStatic}]"
+            "${GIT_BIN}" clone "${SPRING_CLOUD_STATIC_REPO}" "${clonedStatic}" && cd "${clonedStatic}" && "${GIT_BIN}" checkout gh-pages
         else
-            echo "Spring Cloud Static already cloned - will pull changes"
-            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
+            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
         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 checkout gh-pages
-    git pull origin gh-pages
+    cd "${DESTINATION_REPO_FOLDER}"
+    "${GIT_BIN}" checkout gh-pages
+    "${GIT_BIN}" pull origin gh-pages
 
     # Add git branches
     ###################################################################
@@ -172,38 +228,32 @@ 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 ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+            if ! "${GIT_BIN}" 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 add -A ${ROOT_FOLDER}
+        "${GIT_BIN}" 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}
-            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
+        if [[ ",${ALLOWED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
+            mkdir -p "${ROOT_FOLDER}/${CURRENT_BRANCH}"
+            echo -e "Branch [${CURRENT_BRANCH}] is allowed! 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 ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                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"
                     # Not ignored...
                     # 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" ]] ; 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
+                     cp -rf "${f}" "${ROOT_FOLDER}/${CURRENT_BRANCH}"
+                        "${GIT_BIN}" add -A "${ROOT_FOLDER}/${CURRENT_BRANCH}/${file}" || echo "Failed to add the file [${file}]"
                 fi
             done
             COMMIT_CHANGES="yes"
         else
-            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
+            echo -e "Branch [${CURRENT_BRANCH}] is not on the allow list! Check out the Maven [${ALLOW_PROPERTY}] property in
              [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
         fi
     fi
@@ -211,12 +261,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}"
@@ -227,26 +277,20 @@ 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
-    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
+    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
         # Not ignored...
-        # 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}
+        cp -rf "${f}" "${destination}"
+        "${GIT_BIN}" add -A "${destination}"
     fi
 }
 
 function commit_changes_if_applicable() {
     if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
         COMMIT_SUCCESSFUL="no"
-        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
+        "${GIT_BIN}" 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.
@@ -254,7 +298,7 @@ function commit_changes_if_applicable() {
         ###################################################################
         if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
             add_oauth_token_to_remote_url
-            git push origin gh-pages
+            "${GIT_BIN}" push origin gh-pages
         fi
     fi
 }
@@ -262,10 +306,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 checkout ${PREVIOUS_BRANCH} || echo "Failed to check the branch... continuing with the script"
-    if [ "$dirty" != "0" ]; then git stash pop; fi
-    exit 0
+    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
 }
 
 # Assert if properties have been properly passed
@@ -285,16 +329,16 @@ the script will work in the following manner:
 
 - if there's no gh-pages / target for docs module then the script ends
 - for master branch the generated docs are copied to the root of gh-pages branch
-- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
+- for any other branch (if that branch is allowed) a subfolder with branch name is created
     and docs are copied there
 - 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
+    with that version number will be created in the gh-pages branch. WARNING! No allow 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:
 
@@ -322,53 +366,58 @@ 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
 
-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"
+if [[ "${SOURCE_FUNCTIONS}" == "true" ]]; then
+    echo "Will just source functions. Will not run any commands"
 else
-    switch_to_tag
+    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
 fi
-build_docs_if_applicable
-retrieve_doc_properties
-stash_changes
-add_docs_from_target
-checkout_previous_branch

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+include::spring-cloud-build.adoc[]

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

@@ -0,0 +1,148 @@
+#!/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 run 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

@@ -1,211 +0,0 @@
-#!/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

@@ -1,35 +0,0 @@
-/* 
-   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

@@ -1,9 +0,0 @@
-@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

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

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

@@ -1,342 +0,0 @@
-@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

@@ -1,45 +0,0 @@
-<?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

@@ -1,31 +0,0 @@
-<?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

@@ -1,73 +0,0 @@
-<?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

@@ -1,30 +0,0 @@
-<?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

@@ -1,157 +0,0 @@
-<?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

@@ -1,611 +0,0 @@
-<?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

@@ -1,23 +0,0 @@
-<?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

@@ -1,41 +0,0 @@
-<?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

@@ -1,95 +0,0 @@
-<?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

@@ -1,117 +0,0 @@
-<?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

@@ -1,151 +0,0 @@
-<?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

@@ -1,194 +0,0 @@
-<?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

@@ -1,176 +0,0 @@
-<?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

@@ -1,122 +0,0 @@
-<?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

@@ -1,45 +0,0 @@
-<?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

@@ -1,117 +0,0 @@
-<?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

@@ -1,147 +0,0 @@
-<?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

@@ -1,37 +0,0 @@
-<?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

@@ -1,120 +0,0 @@
-<?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

@@ -1,154 +0,0 @@
-<?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

@@ -1,38 +0,0 @@
-<?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

@@ -1,100 +0,0 @@
-<?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

@@ -1,109 +0,0 @@
-<?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

@@ -1,565 +0,0 @@
-<?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

@@ -1,47 +0,0 @@
-<?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/java/org/springframework/cloud/internal/Main.java

@@ -0,0 +1,152 @@
+/*
+ * Copyright 2012-2020 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.nio.file.Files;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Marcin Grzejszczak
+ */
+public class Main {
+
+	public static void main(String... args) {
+		String outputFile = args[0];
+		String inclusionPattern = args.length > 1 ? args[1] : ".*";
+		File parent = new File(outputFile).getParentFile();
+		if (!parent.exists()) {
+			System.out.println("No parent directory [" + parent.toString()
+					+ "] found. Will not generate the configuration properties file");
+			return;
+		}
+		new Generator().generate(outputFile, inclusionPattern);
+	}
+
+	static class Generator {
+
+		void generate(String outputFile, String inclusionPattern) {
+			try {
+				System.out.println("Parsing all configuration metadata");
+				Resource[] resources = getResources();
+				System.out.println("Found [" + resources.length + "] configuration metadata jsons");
+				TreeSet<String> names = new TreeSet<>();
+				Map<String, ConfigValue> descriptions = new HashMap<>();
+				final AtomicInteger count = new AtomicInteger();
+				final AtomicInteger matchingPropertyCount = new AtomicInteger();
+				final AtomicInteger propertyCount = new AtomicInteger();
+				Pattern pattern = Pattern.compile(inclusionPattern);
+				for (Resource resource : resources) {
+					if (resourceNameContainsPattern(resource)) {
+						count.incrementAndGet();
+						byte[] bytes = StreamUtils.copyToByteArray(resource.getInputStream());
+						Map<String, Object> response = new ObjectMapper().readValue(bytes, HashMap.class);
+						List<Map<String, Object>> properties = (List<Map<String, Object>>) response.get("properties");
+						properties.forEach(val -> {
+							propertyCount.incrementAndGet();
+							String name = String.valueOf(val.get("name"));
+							if (!pattern.matcher(name).matches()) {
+								return;
+							}
+							Object description = val.get("description");
+							Object defaultValue = val.get("defaultValue");
+							matchingPropertyCount.incrementAndGet();
+							names.add(name);
+							descriptions.put(name, new ConfigValue(name, description, defaultValue));
+						});
+					}
+				}
+				System.out.println(
+						"Found [" + count + "] Cloud projects configuration metadata jsons. [" + matchingPropertyCount
+								+ "/" + propertyCount + "] were matching the pattern [" + inclusionPattern + "]");
+				System.out.println("Successfully built the description table");
+				if (names.isEmpty()) {
+					System.out.println("Will not update the table, since no configuration properties were found!");
+					return;
+				}
+				Files.write(new File(outputFile).toPath(),
+						("|===\n"
+								+ "|Name | Default | Description\n\n" + names.stream()
+										.map(it -> descriptions.get(it).toString()).collect(Collectors.joining("\n"))
+								+ "\n\n" + "|===").getBytes());
+				System.out.println("Successfully stored the output file");
+			}
+			catch (IOException e) {
+				throw new IllegalStateException(e);
+			}
+		}
+
+		protected boolean resourceNameContainsPattern(Resource resource) {
+			try {
+				return resource.getURL().toString().contains("cloud");
+			}
+			catch (Exception e) {
+				System.out.println("Exception [" + e + "] for resource [" + resource
+						+ "] occurred while trying to retrieve its URL");
+				return false;
+			}
+		}
+
+		protected Resource[] getResources() throws IOException {
+			return new PathMatchingResourcePatternResolver()
+					.getResources("classpath*:/META-INF/spring-configuration-metadata.json");
+		}
+
+	}
+
+	static class ConfigValue {
+
+		public String name;
+
+		public String description;
+
+		public String defaultValue;
+
+		ConfigValue() {
+		}
+
+		ConfigValue(String name, Object 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("\\|", "\\\\|") : "";
+		}
+
+		public String toString() {
+			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`+++" + defaultValue + "+++`") : "") + " | " + description;
+		}
+
+	}
+
+}

docs/src/main/java/org/springframework/cloud/internal/asciidoctor/CoalescerPreprocessor.java

@@ -0,0 +1,126 @@
+/*
+ * Copyright 2012-2020 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.asciidoctor;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.asciidoctor.ast.Document;
+import org.asciidoctor.extension.Preprocessor;
+import org.asciidoctor.extension.PreprocessorReader;
+
+// taken from https://github.com/hibernate/hibernate-asciidoctor-extensions/blob/1.0.3.Final/src/main/java/org/hibernate/infra/asciidoctor/extensions/savepreprocessed/SavePreprocessedOutputPreprocessor.java
+/**
+ * Preprocessor used to save the preprocessed output of the asciidoctor conversion. It allows to generate a single file
+ * integrating all the includes.
+ *
+ * @author Guillaume Smet
+ */
+class CoalescerPreprocessor extends Preprocessor {
+
+	private final File outputFile;
+
+	private static final List<String> FILTER_LICENSE_MARKERS = Arrays.asList("[preface]", "<<<");
+
+	private static final String COMMENT_MARKER = "//";
+
+	private static final String SOURCE_MARKER = "[source";
+
+	private static final List<String> SECTION_MARKERS = Arrays.asList("----", "....");
+
+	private static final String HEADER = "////\n" + "DO NOT EDIT THIS FILE. IT WAS GENERATED.\n"
+			+ "Manual changes to this file will be lost when it is generated again.\n"
+			+ "Edit the files in the src/main/asciidoc/ directory instead.\n" + "////\n\n";
+
+	CoalescerPreprocessor(File output_file) {
+		outputFile = output_file;
+	}
+
+	@Override
+	public void process(Document document, PreprocessorReader preprocessorReader) {
+		try {
+			LinkedList<String> filteredLines = filterLines(preprocessorReader.readLines());
+			filteredLines.addFirst(HEADER);
+			Files.write(outputFile.toPath(), filteredLines);
+		}
+		catch (IOException e) {
+			throw new IllegalStateException("Unable to write the preprocessed file " + outputFile, e);
+		}
+	}
+
+	/**
+	 * This is used to filter out the license headers that are just after the markers
+	 * defined. It also reindents the source code with spaces to be consistent with the
+	 * 1.1 spec.
+	 */
+	private LinkedList<String> filterLines(List<String> lines) {
+		LinkedList<String> filteredLines = new LinkedList<>();
+		ParsingState state = ParsingState.NORMAL;
+		int counter = 0;
+		for (String line : lines) {
+			counter++;
+			switch (state) {
+			case NORMAL:
+				if (FILTER_LICENSE_MARKERS.contains(line)) {
+					state = ParsingState.FILTER_LICENSE;
+				}
+				else if (line.startsWith(SOURCE_MARKER)) {
+					state = ParsingState.SOURCE;
+				}
+				break;
+			case SOURCE:
+				if (SECTION_MARKERS.contains(line)) {
+					state = ParsingState.SOURCE_CONTENT;
+				}
+				else {
+					System.err.println("[source] requires to be followed by a section marker and line number [" + counter + "] with content [" + line + "] doesn't have it");
+				}
+				break;
+			case SOURCE_CONTENT:
+				if (SECTION_MARKERS.contains(line)) {
+					state = ParsingState.NORMAL;
+				}
+				else {
+					filteredLines.add(line.replaceAll("\t", "    "));
+					continue;
+				}
+				break;
+			case FILTER_LICENSE:
+				if (line.startsWith(COMMENT_MARKER)) {
+					continue;
+				}
+				else {
+					state = ParsingState.NORMAL;
+				}
+				break;
+			}
+			filteredLines.add(line);
+		}
+		return filteredLines;
+	}
+
+	private enum ParsingState {
+
+		NORMAL, FILTER_LICENSE, SOURCE, SOURCE_CONTENT,
+
+	}
+
+}

docs/src/main/java/org/springframework/cloud/internal/asciidoctor/ReadmeMain.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2020 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.asciidoctor;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import org.asciidoctor.Asciidoctor;
+import org.asciidoctor.Attributes;
+import org.asciidoctor.Options;
+import org.asciidoctor.SafeMode;
+
+public class ReadmeMain {
+	public static void main(String... args) {
+		File inputFile = new File(args[0]);
+		File outputFile = new File(args[1]);
+		System.out.println("Will do the Readme conversion from [" + inputFile + "] to [" + outputFile + "]");
+		if (!inputFile.exists()) {
+			System.out.println("There's no file [" + inputFile + "], skipping readme generation");
+			return;
+		}
+		new ReadmeMain().convert(inputFile, outputFile);
+	}
+
+	void convert(File input, File output) {
+		Asciidoctor asciidoctor = Asciidoctor.Factory.create();
+		asciidoctor.javaExtensionRegistry().preprocessor(new CoalescerPreprocessor(output));
+		Options options = options(input, output);
+		try {
+			String fileAsString = new String(Files.readAllBytes(input.toPath()));
+			asciidoctor.convert(fileAsString, options);
+			System.out.println("Successfully converted the Readme file!\n");
+		} catch (IOException ex) {
+			throw new IllegalStateException("Failed to convert the file", ex);
+		}
+	}
+
+	private Options options(File input, File output) {
+		Attributes attributes = Attributes.builder()
+				.allowUriRead(true)
+				.attribute("project-root", output.getParent())
+				.build();
+
+		return Options.builder()
+				.sourceDir(input.getParentFile())
+				.baseDir(input.getParentFile())
+				.attributes(attributes)
+				.safe(SafeMode.UNSAFE)
+				.parseHeaderOnly(true)
+				.build();
+	}
+}

docs/src/main/ruby/generate_readme.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env ruby
-
-base_dir = File.join(File.dirname(__FILE__),'../../..')
-src_dir = File.join(base_dir, "/src/main/asciidoc")
-require 'asciidoctor'
-require 'optparse'
-
-options = {}
-file = "#{src_dir}/README.adoc"
-
-OptionParser.new do |o|
-  o.on('-o OUTPUT_FILE', 'Output file (default is stdout)') { |file| options[:to_file] = file unless file=='-' }
-  o.on('-h', '--help') { puts o; exit }
-  o.parse!
-end
-
-file = ARGV[0] if ARGV.length>0
-
-# Copied from https://github.com/asciidoctor/asciidoctor-extensions-lab/blob/master/scripts/asciidoc-coalescer.rb
-doc = Asciidoctor.load_file file, safe: :unsafe, header_only: true, attributes: options[:attributes]
-header_attr_names = (doc.instance_variable_get :@attributes_modified).to_a
-header_attr_names.each {|k| doc.attributes[%(#{k}!)] = '' unless doc.attr? k }
-attrs = doc.attributes
-attrs['allow-uri-read'] = true
-puts attrs
-
-out = <<-WARNING
-////
-DO NOT EDIT THIS FILE. IT WAS GENERATED.
-Manual changes to this file will be lost when it is generated again.
-Edit the files in the src/main/asciidoc/ directory instead.
-////
-
-WARNING
-doc = Asciidoctor.load_file file, safe: :unsafe, parse: false, attributes: attrs
-out << doc.reader.read
-
-unless options[:to_file]
-  puts out
-else
-  File.open(options[:to_file],'w+') do |file|
-    file.write(out)
-  end
-end

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

@@ -0,0 +1,116 @@
+/*
+ * 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

@@ -0,0 +1,35 @@
+/*
+ * 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/java/org/springframework/cloud/internal/asciidoctor/ReadmeMainTests.java

@@ -0,0 +1,36 @@
+package org.springframework.cloud.internal.asciidoctor;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+class ReadmeMainTests {
+
+	@Test
+	void should_convert_input_with_include_of_external_sources_to_a_single_file() throws URISyntaxException, IOException {
+		File inputFile = new File(ReadmeMainTests.class.getResource("/README.adoc").toURI());
+		File outputFile = deleteIfExists(new File("target/output.adoc"));
+
+		ReadmeMain.main(inputFile.getAbsolutePath(), outputFile.getAbsolutePath());
+
+		then(new String(Files.readAllBytes(outputFile.toPath())))
+			.doesNotContain("include:")
+			.doesNotContain("Unresolved directive")
+			.contains("DO NOT EDIT THIS FILE. IT WAS GENERATED")
+			.contains("Hello world!");
+		then(new File("target/output.html"))
+			.as("Conversion to HTML must not happen").doesNotExist();
+	}
+
+	private File deleteIfExists(File outputFile) {
+		if (outputFile.exists()) {
+			outputFile.delete();
+		}
+		return outputFile;
+	}
+}

docs/src/test/resources/README.adoc

@@ -0,0 +1,165 @@
+image:https://circleci.com/gh/spring-cloud/spring-cloud-build.svg?style=svg[link="https://travis-ci.org/spring-cloud/spring-cloud-build"]
+
+Spring Cloud Build is a common utility project for Spring Cloud
+to use for plugin and dependency management.
+
+== Building and Deploying
+
+To install locally:
+
+----
+
+$ mvn install -s .settings.xml
+----
+
+and to deploy snapshots to repo.spring.io:
+
+----
+$ mvn deploy -DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
+----
+
+for a RELEASE build use
+
+----
+$ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-release-local
+----
+
+and for jcenter use
+
+----
+$ mvn deploy -DaltReleaseDeploymentRepository=bintray::default::https://api.bintray.com/maven/spring/jars/org.springframework.cloud:build
+----
+
+and for Maven Central use
+
+----
+$ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging::default::https://oss.sonatype.org/service/local/staging/deploy/maven2
+----
+
+(the "central" profile is available for all projects in Spring Cloud and it sets up the gpg jar signing, and the repository has to be specified separately for this project because it is a parent of the starter parent which users in turn have as their own parent).
+
+== Contributing
+
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/contributing.adoc[]
+
+== Flattening the POMs
+
+To avoid propagating build setup that is required to build a Spring Cloud project, we're using the maven flatten plugin. It has the advantage of letting you use whatever features you need while publishing "clean" pom to the repository.
+
+In order to add it, add the `org.codehaus.mojo:flatten-maven-plugin` to your `pom.xml`.
+
+[source,xml]
+----
+<build>
+	<plugins>
+		<plugin>
+			<groupId>org.codehaus.mojo</groupId>
+			<artifactId>flatten-maven-plugin</artifactId>
+		</plugin>
+	</plugins>
+</build>
+----
+
+== Reusing the documentation
+
+Spring Cloud Build publishes its `spring-cloud-build-docs` module that contains
+helpful scripts (e.g. README generation ruby script) and css, xslt and images
+for the Spring Cloud documentation. If you want to follow the same convention
+approach of generating documentation just add these plugins to your `docs` module
+
+[source,xml]
+----
+<properties>
+	<upload-docs-zip.phase>deploy</upload-docs-zip.phase> <8>
+</properties>
+<profiles>
+	<profile>
+		<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>
+				</plugin>
+				<plugin>
+					<groupId>org.asciidoctor</groupId>
+					<artifactId>asciidoctor-maven-plugin</artifactId> <5>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-antrun-plugin</artifactId> <6>
+				</plugin>
+				<plugin>
+					<artifactId>maven-deploy-plugin</artifactId> <7>
+				</plugin>
+			</plugins>
+		</build>
+	</profile>
+</profiles>
+----
+<1> 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
+<7> This plugin ensures that the generated zip docs will get published
+<8> This property turns on the "deploy" phase for <7>
+
+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/3.1.x/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`).
+
+include::included.adoc[]

docs/src/test/resources/included.adoc

@@ -0,0 +1 @@
+Hello world!

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

@@ -0,0 +1,16 @@
+{
+  "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/test.adoc

@@ -0,0 +1 @@
+include::included.adoc[]

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

@@ -0,0 +1,16 @@
+{
+  "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"
+    }
+  ]
+}

mvnw

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://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
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Maven Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -54,38 +54,16 @@ case "`uname`" in
   CYGWIN*) cygwin=true ;;
   MINGW*) mingw=true;;
   Darwin*) darwin=true
-           #
-           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
-           # for the new JDKs provided by Oracle.
-           #
-           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
-             #
-             # Oracle JDKs
-             #
-             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi
-
-           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
-             #
-             # Apple JDKs
-             #
-             export JAVA_HOME=`/usr/libexec/java_home`
-           fi
-           ;;
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
 esac
 
 if [ -z "$JAVA_HOME" ] ; then
@@ -130,13 +108,12 @@ if $cygwin ; then
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
-# For Migwn, ensure paths are in UNIX format before anything is touched
+# For Mingw, ensure paths are in UNIX format before anything is touched
 if $mingw ; then
   [ -n "$M2_HOME" ] &&
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
 fi
 
 if [ -z "$JAVA_HOME" ]; then
@@ -184,27 +161,28 @@ fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$M2_HOME" ] &&
-    M2_HOME=`cygpath --path --windows "$M2_HOME"`
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-fi
-
 # traverses directory structure from process work directory to filesystem root
 # first directory with .mvn subdirectory is considered project base directory
 find_maven_basedir() {
-  local basedir=$(pwd)
-  local wdir=$(pwd)
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
   while [ "$wdir" != '/' ] ; do
     if [ -d "$wdir"/.mvn ] ; then
       basedir=$wdir
       break
     fi
-    wdir=$(cd "$wdir/.."; pwd)
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
   done
   echo "${basedir}"
 }
@@ -216,9 +194,108 @@ concat_lines() {
   fi
 }
 
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
 # Provide a "standardized" way to retrieve the CLI args that will
 # work with both Windows and non-Windows executions.
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
@@ -226,28 +303,8 @@ export MAVEN_CMD_LINE_ARGS
 
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-echo "Running version check"
-VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
-echo "The found version is [${VERSION}]"
-
-if echo $VERSION | egrep -q 'M|RC'; then
-    echo Activating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
-else
-    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
-fi
-
-if echo $VERSION | egrep -q 'RELEASE'; then
-    echo Activating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pcentral"
-else
-    echo Deactivating \"central\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q central && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pcentral//')
-fi
-
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -7,7 +7,7 @@
 @REM "License"); you may not use this file except in compliance
 @REM with the License.  You may obtain a copy of the License at
 @REM
-@REM    https://www.apache.org/licenses/LICENSE-2.0
+@REM    http://www.apache.org/licenses/LICENSE-2.0
 @REM
 @REM Unless required by applicable law or agreed to in writing,
 @REM software distributed under the License is distributed on an
@@ -18,7 +18,7 @@
 @REM ----------------------------------------------------------------------------
 
 @REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
+@REM Maven Start Up Batch script
 @REM
 @REM Required ENV vars:
 @REM JAVA_HOME - location of a JDK home dir
@@ -26,7 +26,7 @@
 @REM Optional ENV vars
 @REM M2_HOME - location of maven2's installed home dir
 @REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
 @REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
 @REM     e.g. to debug Maven itself, use
 @REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
@@ -35,7 +35,9 @@
 
 @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
 @echo off
-@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
 @if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
 
 @REM set %HOME% to equivalent of $HOME
@@ -80,8 +82,6 @@ goto error
 
 :init
 
-set MAVEN_CMD_LINE_ARGS=%*
-
 @REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
 @REM Fallback to current working directory if not found.
 
@@ -117,11 +117,48 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
 :endReadAdditionalConfig
 
 SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-
-set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar""
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS%
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+
+FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
 if ERRORLEVEL 1 goto error
 goto end
 

scripts/build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+./mvnw clean install -B -Pdocs ${@}
+#./mvnw clean install -B -DskipTests ${@}

spring-cloud-build-dependencies/pom.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>2.1.6.RELEASE</version>
+	<version>3.1.10</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,34 +14,56 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>2.1.6.RELEASE</version>
+		<version>2.6.15</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
+		<spring-boot.version>2.6.15</spring-boot.version>
+		<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.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>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<execution>
+						<!-- Flatten and simplify our own POM for install/deploy -->
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+						<configuration>
+							<updatePomFile>true</updatePomFile>
+							<flattenMode>bom</flattenMode>
+							<pomElements>
+								<parent>expand</parent>
+								<pluginManagement>keep</pluginManagement>
+								<properties>keep</properties>
+								<repositories>remove</repositories>
+							</pomElements>
+						</configuration>
+					</execution>
+					<execution>
+						<id>flatten-clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	<distributionManagement>
 		<downloadUrl>https://github.com/spring-cloud</downloadUrl>
 		<site>
 			<id>spring-docs</id>
 			<url>
-				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+				https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
 			</url>
 		</site>
 		<repository>
@@ -66,30 +88,18 @@
 				</repository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>bintray</id>
-			<distributionManagement>
-				<repository>
-					<id>bintray</id>
-					<name>Jcenter Repository</name>
-					<url>
-						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
-					</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
 					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 					</url>
 				</repository>
 			</distributionManagement>
@@ -98,6 +108,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -107,6 +118,12 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
@@ -117,7 +134,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -125,7 +142,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -143,7 +160,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -151,7 +168,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>

spring-cloud-build-tools/pom.xml

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

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

@@ -9,6 +9,7 @@
 	<suppress files=".*example.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*integration-tests.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files="(.*Tests\.java|.*Tests\.groovy)" checks="Javadoc*"/>
+	<suppress files=".*src.test.java.*" checks="Javadoc*"/>
 	<suppress files="generated-sources" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*target.*" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*build.*" checks="[a-zA-Z0-9]*"/>

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

@@ -0,0 +1,29 @@
+<?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-build-tools/src/main/resources/checkstyle.xml

@@ -20,9 +20,7 @@
 		<property name="headerFile" value="${checkstyle.header.file}"/>
 		<property name="fileExtensions" value="java,groovy"/>
 	</module>
-	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-		<property name="lineSeparator" value="lf"/>
-	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>
 
 	<!-- TreeWalker Checks -->
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
@@ -122,11 +120,6 @@
 			<property name="excludeScope" value="package"/>
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
-		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-			<property name="scope" value="public"/>
-			<property name="excludeScope" value="package"/>
-			<property name="allowMissingJavadoc" value="true"/>
-		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>
 		</module>

spring-cloud-dependencies-parent/pom.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>2.1.6.RELEASE</version>
+	<version>3.1.10</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -18,13 +19,13 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-				Copyright 2014-2015 the original author or authors.
+				Copyright 2014-2021 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
+				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,
@@ -75,7 +76,7 @@
 		<site>
 			<id>spring-docs</id>
 			<url>
-				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+				https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
 			</url>
 		</site>
 		<repository>
@@ -100,38 +101,60 @@
 				</repository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>bintray</id>
-			<distributionManagement>
-				<repository>
-					<id>bintray</id>
-					<name>Jcenter Repository</name>
-					<url>
-						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
-					</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
 					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 					</url>
 				</repository>
 			</distributionManagement>
 			<build>
 				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<inherited>true</inherited>
+						<executions>
+							<execution>
+								<!-- Flatten and simplify our own POM for install/deploy -->
+								<id>flatten</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>flatten</goal>
+								</goals>
+								<configuration>
+									<updatePomFile>true</updatePomFile>
+									<flattenMode>bom</flattenMode>
+									<pomElements>
+										<parent>expand</parent>
+										<pluginManagement>keep</pluginManagement>
+										<properties>keep</properties>
+										<repositories>remove</repositories>
+										<profiles>keep</profiles>
+									</pomElements>
+								</configuration>
+							</execution>
+							<execution>
+								<id>flatten-clean</id>
+								<phase>clean</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
+						<version>3.2.7</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -141,6 +164,12 @@
 								</goals>
 							</execution>
 						</executions>
+						<configuration>
+							<gpgArguments>
+								<arg>--pinentry-mode</arg>
+								<arg>loopback</arg>
+							</gpgArguments>
+						</configuration>
 					</plugin>
 				</plugins>
 			</build>
@@ -151,7 +180,7 @@
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -159,7 +188,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -177,7 +206,7 @@
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<url>https://repo.spring.io/snapshot</url>
 					<snapshots>
 						<enabled>true</enabled>
 					</snapshots>
@@ -185,7 +214,15 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -194,47 +231,12 @@
 		</profile>
 	</profiles>
 	<build>
-		<plugins>
-			<!--<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<inherited>true</inherited>
-				<configuration>
-					<updatePomFile>true</updatePomFile>
-					<flattenMode>oss</flattenMode>
-					<pomElements>
-						<parent>expand</parent>
-						<distributionManagement>remove</distributionManagement>
-						<repositories>remove</repositories>
-					</pomElements>
-				</configuration>
-				<executions>
-					&lt;!&ndash; enable flattening &ndash;&gt;
-					<execution>
-						<id>flatten</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>flatten</goal>
-						</goals>
-					</execution>
-					&lt;!&ndash; ensure proper cleanup &ndash;&gt;
-					<execution>
-						<id>flatten.clean</id>
-						<phase>clean</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>-->
-		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.4.1</version>
+					<version>${maven-enforcer-plugin.version}</version>
 					<executions>
 						<execution>
 							<id>enforce-versions</id>