Update SNAPSHOT to 4.0.0-M5

Bumping versions
Merge pull request #235 from wind57/bump-formatter
2026-09-17 21:09:00 +00:00 · 2022-10-06 00:15:17 +00:00 · 2022-09-29 14:40:56 +00:00 · 2022-09-11 08:23:08 -04:00 · 2022-09-10 13:17:03 +03:00 · 2022-08-24 13:52:14 -04:00
7 changed files with 35 additions and 50 deletions
@@ -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:
@@ -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>4.0.0-M4</version>
+		<version>4.0.0-M5</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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>4.0.0-M4</version>
+	<version>4.0.0-M5</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>3.0.0-M4</spring-boot.version>
-		<spring-cloud-build.version>4.0.0-M4</spring-cloud-build.version>
+		<spring-boot.version>3.0.0-M5</spring-boot.version>
+		<spring-cloud-build.version>4.0.0-M5</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-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.3</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>
@@ -59,7 +55,7 @@
 		<!-- 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>
+		<spring-javaformat.version>0.0.34</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-source-plugin.version>3.2.1</maven-source-plugin.version>
@@ -114,6 +110,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>
@@ -376,6 +373,7 @@
 						<excludes>
 							<exclude>**/Abstract*.java</exclude>
 						</excludes>
+						<argLine>--add-opens=java.base/java.net=ALL-UNNAMED</argLine>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -1052,25 +1050,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>
@@ -1138,14 +1117,9 @@
 							<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>
+									<groupId>io.spring.asciidoctor.backends</groupId>
+									<artifactId>spring-asciidoctor-backends</artifactId>
+									<version>${spring-asciidoctor-backends.version}</version>
 								</dependency>
 								<dependency>
 									<groupId>org.asciidoctor</groupId>
@@ -1207,6 +1181,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>
@@ -1221,7 +1196,7 @@
 										<goal>process-asciidoc</goal>
 									</goals>
 									<configuration>
-										<backend>html5</backend>
+										<backend>spring-html</backend>
 										<sourceDocumentExtensions>
 											<sourceDocumentExtension>.adoc</sourceDocumentExtension>
 											<sourceDocumentExtension>.htmladoc</sourceDocumentExtension>
@@ -1232,14 +1207,14 @@
 										<attributes>
 											<docinfo>shared</docinfo>
 											<stylesdir>css/</stylesdir>
-											<stylesheet>spring.css</stylesheet>
+											<stylesheet>site.css</stylesheet>
 											<linkcss>true</linkcss>
 											<icons>font</icons>
 											<highlightjsdir>js/highlight</highlightjsdir>
 											<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>
@@ -1256,19 +1231,19 @@
 										<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>
+											<stylesheet>site.css</stylesheet>
 											<linkcss>true</linkcss>
 											<icons>font</icons>
 											<highlightjsdir>js/highlight</highlightjsdir>
@@ -1466,6 +1441,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>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>4.0.0-M4</version>
+	<version>4.0.0-M5</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-M4</version>
+		<version>3.0.0-M5</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>3.0.0-M4</spring-boot.version>
+		<spring-boot.version>3.0.0-M5</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.0-M4</version>
+		<version>4.0.0-M5</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.0-M4</version>
+	<version>4.0.0-M5</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	d894bb5d70	Update SNAPSHOT to 4.0.0-M5	2022-10-06 00:15:17 +00:00
buildmaster	717f97b455	Bumping versions	2022-09-29 14:40:56 +00:00
Ryan Baxter	f9f3341bb0	Merge pull request #235 from wind57/bump-formatter Update Java format plugin version	2022-09-11 08:23:08 -04:00
wind57	4c6634771f	fix	2022-09-10 13:17:03 +03:00
Jay BryantandJay Bryant	a2a40673d8	Switch to using spring-asciidoctor-backends (#234 ) to get the new look and feel and features for the reference docs. Co-authored-by: Jay Bryant <jbryant@vmware.com>	2022-08-24 13:52:14 -04:00
buildmaster	a3f7ab02b9	Bumping versions	2022-08-22 14:57:46 +00:00
Marcin Grzejszczak	6dcc3a8bd8	Merge branch '3.1.x'	2022-08-22 13:33:12 +02:00
Tomaz Fernandes	84b9735bac	Fix Syntax Highlighting for Documentations (#233 ) Resolves GH-232 Syntax highlighting was not being added to code snippets in documentation for projects that inherit from this project.	2022-08-22 12:51:58 +02:00
Tomaz Fernandes	f1015193db	Fix Syntax Highlighting for Documentations (#233 ) Resolves GH-232 Syntax highlighting was not being added to code snippets in documentation for projects that inherit from this project.	2022-08-22 12:51:20 +02:00
buildmaster	059b52a282	Bumping versions	2022-08-17 21:35:05 +00:00
Olga Maciaszek-Sharma	68de0d967f	Increase class access for tests.	2022-08-11 16:18:09 +02:00
buildmaster	7401e65427	Bumping versions	2022-08-02 17:41:31 +00:00
buildmaster	82e6c482e0	Going back to snapshots	2022-07-29 18:36:08 +00:00
Ryan Baxter	db0f4d7157	Merge pull request #230 from RobertRad/patch-1 Escape special characters for config Asciidoc	2022-06-29 14:07:15 -04:00
RobertRad	8c8f591c99	Escape special characters for config Asciidoc	2022-06-29 15:43:49 +02:00
buildmaster	08e3b24a27	Bumping versions	2022-06-14 21:35:05 +00:00
spencergibb	317da7a4e4	Updates to next snapshot version	2022-05-27 12:30:19 -04:00
buildmaster	eca70fe4cc	Update SNAPSHOT to 3.1.3	2022-05-27 12:27:28 -04:00
Marcin Grzejszczak	7e9df7fd7c	Allows to disable default deploy by manipulating the phase (#229 )	2022-05-26 10:12:51 -04:00
Marcin Grzejszczak	82a1cf794b	Update maven.yml	2022-05-19 16:34:51 +02:00
buildmaster	7108146aba	Bumping versions to 3.1.3-SNAPSHOT after release	2022-04-27 08:56:14 +00:00
buildmaster	8e81876fd3	Going back to snapshots	2022-04-27 08:56:14 +00:00
buildmaster	95b5890066	Update SNAPSHOT to 3.1.2	2022-04-27 08:54:53 +00:00
Olga Maciaszek-Sharma	63bd653948	Revert "Update SNAPSHOT to 3.1.2" This reverts commit `c3ffb0a5dc`.	2022-04-27 10:49:56 +02:00
Olga Maciaszek-Sharma	cae59ec9fd	Revert "Going back to snapshots" This reverts commit `f4fa5e62cf`.	2022-04-27 10:49:52 +02:00
Olga Maciaszek-Sharma	009fee7f44	Revert "Bumping versions to 3.1.3-SNAPSHOT after release" This reverts commit `119006d160`.	2022-04-27 10:49:45 +02:00
Olga Maciaszek-Sharma	63aa041bbb	Revert "Bumping versions" This reverts commit `a8d9426206`.	2022-04-27 10:49:38 +02:00
Olga Maciaszek-Sharma	83e6e42e54	Revert "Update SNAPSHOT to 3.1.2" This reverts commit `ea265749fa`.	2022-04-27 10:49:34 +02:00
Olga Maciaszek-Sharma	13262df844	Revert "Going back to snapshots" This reverts commit `5dc46d26bb`.	2022-04-27 10:49:29 +02:00
Olga Maciaszek-Sharma	b83f87423b	Revert "Bumping versions to 3.1.3-SNAPSHOT after release" This reverts commit `769c5e1989`.	2022-04-27 10:49:18 +02:00
buildmaster	769c5e1989	Bumping versions to 3.1.3-SNAPSHOT after release	2022-04-27 08:18:32 +00:00
buildmaster	5dc46d26bb	Going back to snapshots	2022-04-27 08:18:32 +00:00
buildmaster	ea265749fa	Update SNAPSHOT to 3.1.2	2022-04-27 08:17:13 +00:00
buildmaster	a8d9426206	Bumping versions	2022-04-26 21:35:11 +00:00
buildmaster	119006d160	Bumping versions to 3.1.3-SNAPSHOT after release	2022-04-26 14:55:47 +00:00
buildmaster	f4fa5e62cf	Going back to snapshots	2022-04-26 14:55:47 +00:00
buildmaster	c3ffb0a5dc	Update SNAPSHOT to 3.1.2	2022-04-26 14:54:07 +00:00
Ryan Baxter	fba352a8af	Bumping spring-boot-dependencies 2.6.7	2022-04-21 17:25:26 -04:00
Ryan Baxter	ad0826c3e3	Bumping Boot version to 2.6.7	2022-04-21 10:12:01 -04:00
buildmaster	8ff3564115	Bumping versions	2022-03-31 21:06:22 +00:00
buildmaster	d04bc15599	Bumping versions to 3.1.2-SNAPSHOT after release	2022-02-14 21:27:38 +00:00
buildmaster	f39e225856	Going back to snapshots	2022-02-14 21:27:38 +00:00
buildmaster	4aa9d8cce4	Update SNAPSHOT to 3.1.1	2022-02-14 21:19:54 +00:00