Update SNAPSHOT to 3.1.9

Removed wrong extensions
Migrates away from spring-docs-resource to spring-asciidoctor-backend; fixes gh-242
2026-09-17 21:09:00 +00:00 · 2023-12-18 22:08:50 +00:00 · 2023-09-25 14:18:19 +02:00 · 2023-09-25 14:12:09 +02:00 · 2023-06-29 10:28:09 +00:00 · 2023-06-29 10:28:09 +00:00
6 changed files with 65 additions and 52 deletions
@@ -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>
 ----

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.9</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 -->
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.1.4-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.8</spring-boot.version>
-		<spring-cloud-build.version>3.1.4-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>
@@ -140,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>
@@ -840,7 +842,7 @@
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
-								<phase>verify</phase>
+								<phase>${maven-gpg-plugin.phase}</phase>
 								<goals>
 									<goal>sign</goal>
 								</goals>
@@ -1053,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>
@@ -1119,6 +1102,7 @@
 									</artifactId>
 									<version>${spring-cloud-build.version}
 									</version>
+									<classifier>${spring-cloud-build-docs-classifier}</classifier>
 									<type>jar</type>
 								</dependency>
 							</dependencies>
@@ -1138,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>
@@ -1158,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>
@@ -1218,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>
@@ -1253,12 +1232,12 @@
 								</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>
@@ -1281,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>
@@ -1365,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>
@@ -1385,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>
@@ -1641,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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>3.1.4-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.8</version>
+		<version>2.6.15</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.8</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>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.4-SNAPSHOT</version>
+		<version>3.1.9</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>3.1.4-SNAPSHOT</version>
+	<version>3.1.9</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	8004f386bf	Update SNAPSHOT to 3.1.9	2023-12-18 22:08:50 +00:00
Marcin Grzejszczak	a010f184b8	Removed wrong extensions	2023-09-25 14:18:19 +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	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	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	6f7f008710	Uses jar-with-deps for sc-build-docs; fixes gh-238	2023-06-26 14:40:37 +02:00
Marcin Grzejszczak	240995fa09	Created a separate task; related to gh-221	2023-05-04 17:12:35 +02:00
Marcin Grzejszczak	661a4ccb61	Don't fail on error; related to gh-221	2023-05-04 17:07:32 +02:00
Marcin Grzejszczak	983d743cd6	Adds a conditional on folder; related to gh-221	2023-05-04 17:03:02 +02:00
Marcin Grzejszczak	04b16bd386	Fixes htmlsingleadoc by copying the index file; gh-221	2023-05-04 16:44:58 +02:00
buildmaster	c34d045a87	Bumping versions to 3.1.8-SNAPSHOT after release	2023-04-27 14:07:42 +00:00
buildmaster	5e60d0ba3b	Going back to snapshots	2023-04-27 14:07:42 +00:00
buildmaster	754ac21e0c	Update SNAPSHOT to 3.1.7	2023-04-27 14:06:04 +00:00
buildmaster	2742082c21	Bumping versions to 3.1.7-SNAPSHOT after release	2023-02-23 21:59:17 +00:00
buildmaster	4965414a99	Going back to snapshots	2023-02-23 21:59:17 +00:00
buildmaster	63c0f70252	Update SNAPSHOT to 3.1.6	2023-02-23 21:57:59 +00:00
Marcin Grzejszczak	4f137c8551	Parametrizes the gpg phase so that projects can opt out of it	2023-02-07 16:19:17 +01:00
buildmaster	9fa4d632f5	Bumping versions to 3.1.6-SNAPSHOT after release	2022-11-03 14:26:50 +00:00
buildmaster	62bcecf8ba	Going back to snapshots	2022-11-03 14:26:50 +00:00
buildmaster	08179ab430	Update SNAPSHOT to 3.1.5	2022-11-03 14:25:27 +00:00
buildmaster	9e17a7fc8d	Going back to snapshots	2022-09-06 19:00:11 +00:00
buildmaster	71ee1e08f7	Update SNAPSHOT to 3.1.4	2022-09-06 18:58:55 +00:00
buildmaster	480c02c009	Bumping versions	2022-09-03 21:35:00 +00:00
buildmaster	f59d853039	Bumping versions	2022-09-02 21:35:02 +00:00
buildmaster	c344ca06b8	Bumping versions to 3.1.5-SNAPSHOT after release	2022-09-02 20:32:28 +00:00
buildmaster	a38b36105b	Going back to snapshots	2022-09-02 20:32:28 +00:00
buildmaster	b103fbd43f	Update SNAPSHOT to 3.1.4	2022-09-02 20:31:14 +00:00
buildmaster	71103bacea	Bumping versions	2022-08-31 21:35:06 +00:00
Ryan Baxter	528b03b71f	Moving to boot 2.6.11	2022-08-31 10:43:16 -04:00
buildmaster	8cf0076cfc	Bumping versions	2022-08-22 21:35:16 +00:00