Update SNAPSHOT to 4.0.6

Merge branch '3.1.x' into 4.0.x
Migrates away from spring-docs-resource to spring-asciidoctor-backend; fixes gh-242
2026-09-17 21:09:00 +00:00 · 2024-01-25 17:23:27 +00:00 · 2023-09-25 14:15:47 +02:00 · 2023-09-25 14:12:09 +02:00 · 2023-09-21 04:11:30 +00:00 · 2023-09-20 14:13:26 -04:00
10 changed files with 53 additions and 67 deletions
@@ -5,7 +5,7 @@ Edit the files in the src/main/asciidoc/ directory instead.
 ////


-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"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=4.0.x&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.
@@ -64,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/{spring-cloud-build-branch}/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.

@@ -75,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/{spring-cloud-build-branch}/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.
@@ -364,46 +364,6 @@ Spring Cloud Build Docs comes with a set of attributes for asciidoctor that you

 [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
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.3</version>
+		<version>4.0.6</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -24,6 +24,7 @@
 		<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 -->
@@ -1,4 +1,4 @@
-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"]
+image::https://github.com/spring-cloud/spring-cloud-build/workflows/Build/badge.svg?branch=4.0.x&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.
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/contributing.adoc[]

 == Flattening the POMs

@@ -1,3 +1,3 @@

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/docs/src/main/asciidoc/building.adoc[]

@@ -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/{spring-cloud-build-branch}/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/{spring-cloud-build-branch}/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.
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.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/main/pom.xml[tags=attributes,indent=0]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/4.0.x/pom.xml[tags=attributes,indent=0]
 ----

 == Updating the guides
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.0.3</version>
+	<version>4.0.6</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,12 +28,12 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>3.0.7</spring-boot.version>
-		<spring-cloud-build.version>4.0.3</spring-cloud-build.version>
+		<spring-boot.version>3.0.13</spring-boot.version>
+		<spring-cloud-build.version>4.0.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-asciidoctor-backends.version>0.0.3</spring-asciidoctor-backends.version>
+		<spring-asciidoctor-backends.version>0.0.5</spring-asciidoctor-backends.version>
 		<asciidoctorj-pdf.version>1.6.2</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>2.1.2</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
@@ -85,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>
@@ -137,6 +138,9 @@
 		<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>
+		<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>
@@ -1098,6 +1102,7 @@
 									</artifactId>
 									<version>${spring-cloud-build.version}
 									</version>
+									<classifier>${spring-cloud-build-docs-classifier}</classifier>
 									<type>jar</type>
 								</dependency>
 							</dependencies>
@@ -1132,6 +1137,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>
@@ -1192,7 +1202,7 @@
 							<executions>
 								<execution>
 									<id>generate-html-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -1227,7 +1237,7 @@
 								</execution>
 								<execution>
 									<id>generate-htmlsingle-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -1255,7 +1265,7 @@
 								</execution>
 								<execution>
 									<id>generate-pdf-documentation</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>process-asciidoc</goal>
 									</goals>
@@ -1339,7 +1349,7 @@
 								</execution>
 								<execution>
 									<id>assert-no-unresolved-links</id>
-									<phase>prepare-package</phase>
+									<phase>${generate-docs.phase}</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
@@ -1361,7 +1371,7 @@
 								</execution>
 								<execution>
 									<id>copy-missing-html-files</id>
-									<phase>package</phase>
+									<phase>${copy-missing-html-files.phase}</phase>
 									<goals>
 										<goal>run</goal>
 									</goals>
@@ -1376,7 +1386,7 @@
 								</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>
@@ -1630,5 +1640,20 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>CI</id>
+			<activation>
+				<property>
+					<name>env.GITHUB_API_URL</name>
+				</property>
+			</activation>
+			<properties>
+				<!-- 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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.0.3</version>
+	<version>4.0.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.7</version>
+		<version>3.0.13</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.0.7</spring-boot.version>
+		<spring-boot.version>3.0.13</spring-boot.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 	<build>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.0.3</version>
+		<version>4.0.6</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -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.3</version>
+	<version>4.0.6</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	23496a79be	Update SNAPSHOT to 4.0.6	2024-01-25 17:23:27 +00:00
Marcin Grzejszczak	94e6807e09	Merge branch '3.1.x' into 4.0.x	2023-09-25 14:15:47 +02:00
Marcin Grzejszczak	baca4d23cc	Migrates away from spring-docs-resource to spring-asciidoctor-backend; fixes gh-242	2023-09-25 14:12:09 +02:00
buildmaster	b528877aab	Bumping versions	2023-09-21 04:11:30 +00:00
Spencer Gibb	f2de5d1302	reference 4.0.x for docs	2023-09-20 14:13:26 -04:00
Ryan Baxter	10a19d7e3b	Update building-jdk8.adoc	2023-09-08 17:03:13 -04:00
buildmaster	c53e18927a	Bumping versions to 4.0.6-SNAPSHOT after release	2023-07-27 19:23:47 +00:00
buildmaster	7a6735ea04	Going back to snapshots	2023-07-27 19:23:47 +00:00
buildmaster	f20e58b49c	Update SNAPSHOT to 4.0.5	2023-07-27 19:22:04 +00:00
Olga MaciaszekSharma	1b60c5b801	Upgrade to Boot 3.0.9.	2023-07-26 16:46:13 +02:00
buildmaster	53f01d9804	Bumping versions	2023-07-07 04:11:30 +00:00
buildmaster	413ada770c	Bumping versions to 4.0.5-SNAPSHOT after release	2023-07-06 06:36:03 +00:00
buildmaster	00d08e83b0	Going back to snapshots	2023-07-06 06:36:03 +00:00
buildmaster	c3995a08fa	Update SNAPSHOT to 4.0.4	2023-07-06 06:34:30 +00:00
buildmaster	a237137ed4	Bumping versions to 3.1.9-SNAPSHOT after release	2023-06-29 10:28:09 +00:00
buildmaster	195ce4e753	Going back to snapshots	2023-06-29 10:28:09 +00:00
buildmaster	6a8dfa60d3	Update SNAPSHOT to 3.1.8	2023-06-29 10:26:50 +00:00
Marcin Grzejszczak	21a18395fa	Merge branch '3.1.x' into 4.0.x	2023-06-27 16:04:31 +02:00
Marcin Grzejszczak	a2e2ff90e2	Not building the docs for CI builds - changed the env var; fixes gh-239	2023-06-27 14:13:48 +02:00
Marcin Grzejszczak	d7f3a8f35d	Not building the docs for CI builds - we cant' fetch jars; fixes gh-239	2023-06-27 14:07:14 +02:00
Marcin Grzejszczak	b52dff8956	Revert "Not building the docs for CI builds - we cant' fetch jars; fixes gh-239" This reverts commit `4bea4c590f`.	2023-06-27 13:43:19 +02:00
Marcin Grzejszczak	4bea4c590f	Not building the docs for CI builds - we cant' fetch jars; fixes gh-239	2023-06-27 13:39:12 +02:00
Marcin Grzejszczak	8087edaf9a	Unpacking docs resources only for non CI builds, fixed wrong env var derefernce; fixes gh-239	2023-06-27 12:48:21 +02:00
Marcin Grzejszczak	79ec1a0b58	Unpacking docs resources only for non CI builds; fixes gh-239	2023-06-27 12:29:41 +02:00
Marcin Grzejszczak	a14578930a	Merge branch '3.1.x' into 4.0.x	2023-06-26 14:40:56 +02:00
Marcin Grzejszczak	6f7f008710	Uses jar-with-deps for sc-build-docs; fixes gh-238	2023-06-26 14:40:37 +02:00
Spencer Gibb	2701008de8	Updates spring-asciidoctor-backends version to 0.0.5	2023-06-20 12:21:05 -04:00
buildmaster	3243b7a322	Bumping versions	2023-05-25 23:06:26 +00:00
buildmaster	cb733fd590	Bumping versions	2023-05-25 14:57:21 +00:00
buildmaster	a6af2759db	Bumping versions to 4.0.4-SNAPSHOT after release	2023-05-24 17:16:10 +00:00
buildmaster	5d6caf1235	Going back to snapshots	2023-05-24 17:16:10 +00:00