Update SNAPSHOT to 3.1.6

Resolves GH-232

Syntax highlighting was not being added to code snippets in documentation for projects that inherit from this project.

.github/workflows/maven.yml

@@ -5,21 +5,25 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 3.1.x ]
   pull_request:
-    branches: [ main ]
+    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
+      - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 1.8
       - name: Cache local Maven repository
         uses: actions/cache@v2
         with:

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-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

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

README.adoc

@@ -402,6 +402,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
     <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>
 ----
 

docs/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.6</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -20,6 +20,8 @@
 		<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>
 	</properties>

docs/src/main/asciidoc/README.adoc

@@ -40,7 +40,7 @@ $ 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
 
@@ -128,7 +128,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 
 [source,xml]
 ----
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/pom.xml[tags=attributes,indent=0]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/pom.xml[tags=attributes,indent=0]
 ----
 
 == Updating the guides

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.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/java/org/springframework/cloud/internal/Main.java

@@ -144,7 +144,7 @@ public class Main {
 		}
 
 		public String toString() {
-			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`" + defaultValue + "`") : "") + " | " + description;
+			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`+++" + defaultValue + "+++`") : "") + " | " + description;
 		}
 
 	}

docs/src/test/resources/README.adoc

@@ -40,7 +40,7 @@ $ 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
 
@@ -128,7 +128,7 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you
 
 [source,xml]
 ----
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/pom.xml[tags=attributes,indent=0]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/pom.xml[tags=attributes,indent=0]
 ----
 
 == Updating the guides

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>3.1.6</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -19,31 +19,31 @@
 	</modules>
 	<url>https://spring.io/spring-cloud</url>
 	<properties>
-		<java.version>17</java.version>
-		<resource.delimiter>@
-		</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<java.version>1.8</java.version>
+		<!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<resource.delimiter>@</resource.delimiter>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>3.0.0-SNAPSHOT</spring-boot.version>
-		<spring-cloud-build.version>4.0.0-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.6.14</spring-boot.version>
+		<spring-cloud-build.version>3.1.6</spring-cloud-build.version>
 		<docs.resources.dir>${project.build.directory}/build-docs</docs.resources.dir>
 		<docs.classes.dir>${project.build.directory}/build-docs-classes</docs.classes.dir>
 		<refdocs.build.directory>${project.build.directory}/refdocs/</refdocs.build.directory>
-		<spring-doc-resources.version>0.2.4</spring-doc-resources.version>
+		<spring-doc-resources.version>0.2.2.RELEASE</spring-doc-resources.version>
 		<spring-asciidoctor-extensions-boot.version>0.6.0
 		</spring-asciidoctor-extensions-boot.version>
 		<spring-asciidoctor-extensions-block.version>0.6.0
 		</spring-asciidoctor-extensions-block.version>
-		<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
+		<asciidoctorj-pdf.version>1.6.0</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
-		<asciidoctorj.version>2.5.3</asciidoctorj.version>
+		<asciidoctorj.version>2.5.1</asciidoctorj.version>
 		<jruby-complete.version>9.2.19.0</jruby-complete.version>
 
 		<!-- Sonar -->
@@ -54,35 +54,35 @@
 		<sonar.language>java</sonar.language>
 
 		<!-- Plugins -->
-		<maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
 		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
-		<puppycrawl-tools-checkstyle.version>9.2.1</puppycrawl-tools-checkstyle.version>
-		<spring-javaformat.version>0.0.29</spring-javaformat.version>
+		<puppycrawl-tools-checkstyle.version>8.43</puppycrawl-tools-checkstyle.version>
+		<spring-javaformat.version>0.0.26</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
+		<maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
 		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-		<maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
+		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
 		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 		<maven-surefire-report-plugin.version>2.22.2</maven-surefire-report-plugin.version>
-		<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-		<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
+		<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
+		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-		<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
+		<git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
 		<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-		<maven-enforcer-plugin.version>3.0.0</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
-		<maven-gpg-plugin.version>3.2.0</maven-gpg-plugin.version>
+		<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
+		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 		<maven-dependency-plugin.version>3.2.0</maven-dependency-plugin.version>
 		<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
 		<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
-		<artifactory-maven-plugin.version>3.2.3</artifactory-maven-plugin.version>
+		<artifactory-maven-plugin.version>3.2.0</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
-		<spring-javaformat-checkstyle.version>0.0.29</spring-javaformat-checkstyle.version>
+		<spring-javaformat-checkstyle.version>0.0.26</spring-javaformat-checkstyle.version>
 		<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-		<pitest-maven.version>1.7.3</pitest-maven.version>
-		<pitest-junit5-plugin.version>0.15</pitest-junit5-plugin.version>
+		<pitest-maven.version>1.6.7</pitest-maven.version>
+		<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true
@@ -100,7 +100,7 @@
 		<checkstyle.additional.suppressions.file>
 			${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
 		</checkstyle.additional.suppressions.file>
-		<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
+		<nohttp-checkstyle.version>0.0.7</nohttp-checkstyle.version>
 		<disable.nohttp.checks>true</disable.nohttp.checks>
 		<antelopetasks.version>3.2.10</antelopetasks.version>
 		<ant-nodeps.version>1.8.1</ant-nodeps.version>
@@ -114,6 +114,7 @@
 		<generated-docs-pdf-output.dir>${project.build.directory}/generated-docs/reference/pdf</generated-docs-pdf-output.dir>
 		<javadoc.failOnError>false</javadoc.failOnError>
 		<javadoc.failOnWarnings>false</javadoc.failOnWarnings>
+		<maven-deploy-plugin-default.phase>deploy</maven-deploy-plugin-default.phase>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 		<maven-deploy-plugin.deployZipRepositoryId>repo.spring.io</maven-deploy-plugin.deployZipRepositoryId>
 		<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-snapshot-local</maven-deploy-plugin.deployZipUrl>
@@ -121,7 +122,7 @@
 		<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
 		<readme.class.path>readme.class.path</readme.class.path>
 		<sonar-jacoco-listeners.version>5.14.0.18788</sonar-jacoco-listeners.version>
-		<duplicate-finder-maven-plugin.version>1.5.1</duplicate-finder-maven-plugin.version>
+		<duplicate-finder-maven-plugin.version>1.5.0</duplicate-finder-maven-plugin.version>
 		<duplicate-finder-maven-plugin.printEqualFiles>false</duplicate-finder-maven-plugin.printEqualFiles>
 		<duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfDifferentContentConflict>
 		<duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>false</duplicate-finder-maven-plugin.failBuildInCaseOfEqualContentConflict>
@@ -139,6 +140,7 @@
 		<duplicate-finder-maven-plugin.bootClasspathProperty>sun.boot.class.path</duplicate-finder-maven-plugin.bootClasspathProperty>
 		<duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>true</duplicate-finder-maven-plugin.useDefaultResourceIgnoreList>
 		<duplicate-finder-maven-plugin.includePomProjects>false</duplicate-finder-maven-plugin.includePomProjects>
+		<maven-gpg-plugin.phase>verify</maven-gpg-plugin.phase>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -839,7 +841,7 @@
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
-								<phase>verify</phase>
+								<phase>${maven-gpg-plugin.phase}</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
@@ -1207,6 +1209,7 @@
 									<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>
 								<!-- end::attributes[] -->
 								<requires>
@@ -1239,7 +1242,7 @@
 											<highlightjs-theme>github</highlightjs-theme>
 											<imagesdir>./images</imagesdir>
 											<attribute-missing>warn</attribute-missing>
-											<sourceHighlighter>highlight.js</sourceHighlighter>
+											<source-highlighter>highlight.js</source-highlighter>
 										</attributes>
 										<logHandler>
 											<outputToConsole>true</outputToConsole>
@@ -1263,9 +1266,9 @@
 										<outputDirectory>
 											${generated-docs-singlepage-output.dir}
 										</outputDirectory>
-										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
+											<source-highlighter>highlight.js</source-highlighter>
 											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
 											<stylesheet>spring.css</stylesheet>
@@ -1466,6 +1469,13 @@
 							<artifactId>maven-deploy-plugin</artifactId>
 							<version>${maven-deploy-plugin.version}</version>
 							<executions>
+								<execution>
+									<id>default-deploy</id>
+									<phase>${maven-deploy-plugin-default.phase}</phase>
+									<goals>
+										<goal>deploy</goal>
+									</goals>
+								</execution>
 								<execution>
 									<id>upload-docs-zip</id>
 									<phase>${upload-docs-zip.phase}</phase>
@@ -1528,7 +1538,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.8.7</version>
+						<version>0.8.5</version>
 						<configuration>
 							<destFile>${sonar.jacoco.reportPath}</destFile>
 							<append>true</append>

spring-cloud-build-dependencies/pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<version>3.1.6</version>
 	<name>spring-cloud-build-dependencies</name>
 	<packaging>pom</packaging>
 	<description>Spring Cloud Build Dependencies: an internal BOM for use with Spring
@@ -14,12 +14,12 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-dependencies</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>2.6.14</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.0.0-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>2.6.14</spring-boot.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 	<build>

spring-cloud-build-tools/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.0-SNAPSHOT</version>
+		<version>3.1.6</version>
 	</parent>
 	<dependencies>
 		<dependency>

spring-cloud-dependencies-parent/pom.xml

@@ -4,7 +4,7 @@
 		 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>4.0.0-SNAPSHOT</version>
+	<version>3.1.6</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>