Update SNAPSHOT to 3.1.9

This reverts commit 4bea4c590f.

.github/workflows/maven.yml

@@ -5,9 +5,9 @@ name: Build
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 3.1.x ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 3.1.x ]
 
 jobs:
   build:

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>3.1.1-SNAPSHOT</version>
+		<version>3.1.9</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -20,8 +20,11 @@
 		<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 -->

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

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.1.1-SNAPSHOT</version>
+	<version>3.1.9</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,16 +28,12 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.3</spring-boot.version>
-		<spring-cloud-build.version>3.1.1-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.6.15</spring-boot.version>
+		<spring-cloud-build.version>3.1.9</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.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>
+		<spring-asciidoctor-backends.version>0.0.7</spring-asciidoctor-backends.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>
@@ -89,8 +85,9 @@
 		</maven-checkstyle-plugin.failOnViolation>
 		<maven-checkstyle-plugin.includeTestSourceDirectory>true
 		</maven-checkstyle-plugin.includeTestSourceDirectory>
-		<spring-cloud-build-checkstyle.branch>master
+		<spring-cloud-build-checkstyle.branch>main
 		</spring-cloud-build-checkstyle.branch>
+		<spring-cloud-build-docs-classifier>jar-with-dependencies</spring-cloud-build-docs-classifier>
 		<checkstyle.suppressions.file>
 			https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
 		</checkstyle.suppressions.file>
@@ -114,6 +111,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>
@@ -139,6 +137,11 @@
 		<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>
+		<unpack-docs-resources.phase>generate-resources</unpack-docs-resources.phase>
+		<generate-docs.phase>prepare-package</generate-docs.phase>
+		<copy-missing-html-files.phase>package</copy-missing-html-files.phase>
+		<package-and-attach-docs-zip.phase>package</package-and-attach-docs-zip.phase>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -839,7 +842,7 @@
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
-								<phase>verify</phase>
+								<phase>${maven-gpg-plugin.phase}</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
@@ -1052,25 +1055,6 @@
 										</artifactItems>
 									</configuration>
 								</execution>
-								<execution>
-									<id>unpack-docs-resources</id>
-									<phase>generate-resources</phase>
-									<goals>
-										<goal>unpack</goal>
-									</goals>
-									<configuration>
-										<artifactItems>
-											<artifactItem>
-												<groupId>io.spring.docresources</groupId>
-												<artifactId>spring-doc-resources</artifactId>
-												<version>${spring-doc-resources.version}</version>
-												<type>zip</type>
-												<overWrite>true</overWrite>
-												<outputDirectory>${refdocs.build.directory}</outputDirectory>
-											</artifactItem>
-										</artifactItems>
-									</configuration>
-								</execution>
 							</executions>
 						</plugin>
 						<plugin>
@@ -1118,6 +1102,7 @@
 									</artifactId>
 									<version>${spring-cloud-build.version}
 									</version>
+									<classifier>${spring-cloud-build-docs-classifier}</classifier>
 									<type>jar</type>
 								</dependency>
 							</dependencies>
@@ -1137,16 +1122,6 @@
 							<artifactId>asciidoctor-maven-plugin</artifactId>
 							<version>${asciidoctor-maven-plugin.version}</version>
 							<dependencies>
-								<dependency>
-									<groupId>io.spring.asciidoctor</groupId>
-									<artifactId>spring-asciidoctor-extensions-spring-boot</artifactId>
-									<version>${spring-asciidoctor-extensions-boot.version}</version>
-								</dependency>
-								<dependency>
-									<groupId>io.spring.asciidoctor</groupId>
-									<artifactId>spring-asciidoctor-extensions-block-switch</artifactId>
-									<version>${spring-asciidoctor-extensions-block.version}</version>
-								</dependency>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
 									<artifactId>asciidoctorj-pdf</artifactId>
@@ -1157,6 +1132,11 @@
 									<artifactId>asciidoctorj-diagram</artifactId>
 									<version>${asciidoctorj-diagram.version}</version>
 								</dependency>
+								<dependency>
+									<groupId>io.spring.asciidoctor.backends</groupId>
+									<artifactId>spring-asciidoctor-backends</artifactId>
+									<version>${spring-asciidoctor-backends.version}</version>
+								</dependency>
 							</dependencies>
 							<configuration>
 								<sourceDirectory>${refdocs.build.directory}</sourceDirectory>
@@ -1207,6 +1187,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>
@@ -1216,12 +1197,12 @@
 							<executions>
 								<execution>
 									<id>generate-html-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
 											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
@@ -1239,7 +1220,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>
@@ -1251,21 +1232,21 @@
 								</execution>
 								<execution>
 									<id>generate-htmlsingle-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>
 										<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>
@@ -1279,7 +1260,7 @@
 								</execution>
 								<execution>
 									<id>generate-pdf-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -1363,7 +1344,7 @@
 								</execution>
 								<execution>
 									<id>assert-no-unresolved-links</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
@@ -1383,9 +1364,24 @@
 										</target>
 									</configuration>
 								</execution>
+								<execution>
+									<id>copy-missing-html-files</id>
+									<phase>${copy-missing-html-files.phase}</phase>
+									<goals>
+										<goal>run</goal>
+									</goals>
+									<configuration>
+										<failOnError>false</failOnError>
+										<target>
+											<copy tofile="${project.build.directory}/generated-docs/reference/htmlsingle/index.html">
+												<fileset dir="${project.build.directory}/generated-docs/reference/htmlsingle" includes="${docs.main}.html" />
+											</copy>
+										</target>
+									</configuration>
+								</execution>
 								<execution>
 									<id>package-and-attach-docs-zip</id>
-									<phase>package</phase>
+									<phase>${package-and-attach-docs-zip.phase}</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
@@ -1466,6 +1462,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>
@@ -1632,5 +1635,22 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>CI</id>
+			<activation>
+				<property>
+					<name>env.GITHUB_API_URL</name>
+				</property>
+			</activation>
+			<properties>
+				<!-- This jar requires authentication, we don't need anything css related in a PR -->
+				<unpack-docs-resources.phase>none</unpack-docs-resources.phase>
+				<!-- Because of this we will not be catching broken docs in the PRs -->
+				<generate-docs.phase>none</generate-docs.phase>
+				<copy-missing-html-files.phase>none</copy-missing-html-files.phase>
+				<package-and-attach-docs-zip.phase>none</package-and-attach-docs-zip.phase>
+				<upload-docs-zip.phase>none</upload-docs-zip.phase>
+			</properties>
+		</profile>
 	</profiles>
 </project>

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>3.1.1-SNAPSHOT</version>
+	<version>3.1.9</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>2.6.3</version>
+		<version>2.6.15</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.3</spring-boot.version>
+		<spring-boot.version>2.6.15</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>3.1.1-SNAPSHOT</version>
+		<version>3.1.9</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>3.1.1-SNAPSHOT</version>
+	<version>3.1.9</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>