From 6a8dfa60d38fd1b461f1afedec993f8c972cc057 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 10:26:50 +0000
Subject: [PATCH 1/4] Update SNAPSHOT to 3.1.8

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 6 +++---
 spring-cloud-build-dependencies/pom.xml  | 6 +++---
 spring-cloud-build-tools/pom.xml         | 2 +-
 spring-cloud-dependencies-parent/pom.xml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 0028acc6..1c14cfcb 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.8</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
diff --git a/pom.xml b/pom.xml
index 55511e93..ec99f142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.8</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.14</spring-boot.version>
-		<spring-cloud-build.version>3.1.8-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.6.15</spring-boot.version>
+		<spring-cloud-build.version>3.1.8</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>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index 2ee0cf52..84efa996 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/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.8-SNAPSHOT</version>
+	<version>3.1.8</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.14</version>
+		<version>2.6.15</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.14</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>
diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml
index a8ebefda..5003751c 100644
--- a/spring-cloud-build-tools/pom.xml
+++ b/spring-cloud-build-tools/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.8</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml
index 4c29d12f..6e77e9e5 100644
--- a/spring-cloud-dependencies-parent/pom.xml
+++ b/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.8-SNAPSHOT</version>
+	<version>3.1.8</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>

From 195ce4e753d7fee577279caade10743a5d35cd73 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 10:28:09 +0000
Subject: [PATCH 2/4] Going back to snapshots

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 6 +++---
 spring-cloud-build-dependencies/pom.xml  | 6 +++---
 spring-cloud-build-tools/pom.xml         | 2 +-
 spring-cloud-dependencies-parent/pom.xml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 1c14cfcb..0028acc6 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8</version>
+		<version>3.1.8-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
diff --git a/pom.xml b/pom.xml
index ec99f142..55511e93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.1.8</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.15</spring-boot.version>
-		<spring-cloud-build.version>3.1.8</spring-cloud-build.version>
+		<spring-boot.version>2.6.14</spring-boot.version>
+		<spring-cloud-build.version>3.1.8-SNAPSHOT</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>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index 84efa996..2ee0cf52 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/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.8</version>
+	<version>3.1.8-SNAPSHOT</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.15</version>
+		<version>2.6.14</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.15</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>
diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml
index 5003751c..a8ebefda 100644
--- a/spring-cloud-build-tools/pom.xml
+++ b/spring-cloud-build-tools/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8</version>
+		<version>3.1.8-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml
index 6e77e9e5..4c29d12f 100644
--- a/spring-cloud-dependencies-parent/pom.xml
+++ b/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.8</version>
+	<version>3.1.8-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>

From a237137ed441e0687992fbf2329aaff77a6c22c4 Mon Sep 17 00:00:00 2001
From: buildmaster <builds@springframework.org>
Date: Thu, 29 Jun 2023 10:28:09 +0000
Subject: [PATCH 3/4] Bumping versions to 3.1.9-SNAPSHOT after release

---
 docs/pom.xml                             | 2 +-
 pom.xml                                  | 6 +++---
 spring-cloud-build-dependencies/pom.xml  | 6 +++---
 spring-cloud-build-tools/pom.xml         | 2 +-
 spring-cloud-dependencies-parent/pom.xml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 0028acc6..b7f4d2db 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.9-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
diff --git a/pom.xml b/pom.xml
index 55511e93..4af760ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.1.8-SNAPSHOT</version>
+	<version>3.1.9-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,8 +28,8 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.14</spring-boot.version>
-		<spring-cloud-build.version>3.1.8-SNAPSHOT</spring-cloud-build.version>
+		<spring-boot.version>2.6.15</spring-boot.version>
+		<spring-cloud-build.version>3.1.9-SNAPSHOT</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>
diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml
index 2ee0cf52..705b2c11 100644
--- a/spring-cloud-build-dependencies/pom.xml
+++ b/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.8-SNAPSHOT</version>
+	<version>3.1.9-SNAPSHOT</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.14</version>
+		<version>2.6.15</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.14</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>
diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml
index a8ebefda..e24c544d 100644
--- a/spring-cloud-build-tools/pom.xml
+++ b/spring-cloud-build-tools/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.8-SNAPSHOT</version>
+		<version>3.1.9-SNAPSHOT</version>
 	</parent>
 	<dependencies>
 		<dependency>
diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml
index 4c29d12f..69eec288 100644
--- a/spring-cloud-dependencies-parent/pom.xml
+++ b/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.8-SNAPSHOT</version>
+	<version>3.1.9-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>

From baca4d23cc2b70eedf58970a2f6145efebbe056c Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Mon, 25 Sep 2023 14:12:09 +0200
Subject: [PATCH 4/4] Migrates away from spring-docs-resource to
 spring-asciidoctor-backend; fixes gh-242

---
 pom.xml | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4af760ad..65b7f37f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 		<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-backends.version>0.0.7</spring-asciidoctor-backends.version>
 		<spring-asciidoctor-extensions-boot.version>0.6.0
 		</spring-asciidoctor-extensions-boot.version>
 		<spring-asciidoctor-extensions-block.version>0.6.0
@@ -89,7 +89,7 @@
 		</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>
@@ -1059,25 +1059,6 @@
 										</artifactItems>
 									</configuration>
 								</execution>
-								<execution>
-									<id>unpack-docs-resources</id>
-									<phase>${unpack-docs-resources.phase}</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>
@@ -1165,6 +1146,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>
@@ -1230,7 +1216,7 @@
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
 											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
@@ -1265,7 +1251,7 @@
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.htmlsingleadoc</sourceDocumentExtension>
 										</sourceDocumentExtensions>