Update SNAPSHOT to 3.1.4

Bumping versions
2026-09-17 21:09:00 +00:00 · 2022-09-06 18:58:55 +00:00 · 2022-09-03 21:35:00 +00:00 · 2022-09-02 21:35:02 +00:00 · 2022-09-02 20:32:28 +00:00 · 2022-09-02 20:32:28 +00:00
15 changed files with 39 additions and 95 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:
@@ -18,5 +18,4 @@ _site/
 .factorypath
 .vscode/
 .flattened-pom.xml
-.DS_Store
-.sdkmanrc
+.DS_Store
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.292.hs-adpt
@@ -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.0</version>
+		<version>3.1.4</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>
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

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

 == Updating the guides
@@ -1,4 +1,4 @@
 :jdkversion: 1.8

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

@@ -1,3 +1,3 @@
 :jdkversion: 1.8

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.x/docs/src/main/asciidoc/building-base.adoc[]
@@ -144,7 +144,7 @@ public class Main {
 		}

 		public String toString() {
-			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`" + defaultValue + "`") : "") + " | " + description;
+			return "|" + name + " | " + (StringUtils.hasText(defaultValue) ? ("`+++" + defaultValue + "+++`") : "") + " | " + description;
 		}

 	}
@@ -40,7 +40,7 @@ $ mvn deploy -P central -DaltReleaseDeploymentRepository=sonatype-nexus-staging:

 == Contributing

-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.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/master/pom.xml[tags=attributes,indent=0]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/3.1.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>3.1.0</version>
+	<version>3.1.4</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -20,16 +20,16 @@
 	<url>https://spring.io/spring-cloud</url>
 	<properties>
 		<java.version>1.8</java.version>
-		<resource.delimiter>@
-		</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<!-- delimiter that doesn't clash with Spring ${} placeholders -->
+		<resource.delimiter>@</resource.delimiter>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.6.1</spring-boot.version>
-		<spring-cloud-build.version>3.1.0</spring-cloud-build.version>
+		<spring-boot.version>2.6.11</spring-boot.version>
+		<spring-cloud-build.version>3.1.4</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>
@@ -114,6 +114,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,7 +140,6 @@
 		<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.deploy.skip>false</maven.deploy.skip>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -833,26 +833,6 @@
 			<id>central</id>
 			<build>
 				<plugins>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
-						<extensions>true</extensions>
-						<configuration>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<serverId>sonatype-nexus-staging</serverId>
-							<autoReleaseAfterClose>false</autoReleaseAfterClose>
-						</configuration>
-						<executions>
-							<execution>
-							  <id>default-deploy</id>
-							  <phase>deploy</phase>
-							  <goals>
-								<goal>deploy</goal>
-							  </goals>
-							</execution>
-						  </executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
@@ -870,7 +850,6 @@
 				</plugins>
 			</build>
 			<properties>
-				<maven.deploy.skip>true</maven.deploy.skip>
 				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-release-local</maven-deploy-plugin.deployZipUrl>
 			</properties>
 		</profile>
@@ -1229,6 +1208,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>
@@ -1261,7 +1241,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>
@@ -1285,9 +1265,9 @@
 										<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>
@@ -1488,6 +1468,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>3.1.0</version>
+	<version>3.1.4</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.1</version>
+		<version>2.6.11</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.6.1</spring-boot.version>
+		<spring-boot.version>2.6.11</spring-boot.version>
 		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
 	</properties>
 	<build>
@@ -90,9 +90,6 @@
 		</profile>
 		<profile>
 			<id>central</id>
-			<properties>
-				<maven.deploy.skip>true</maven.deploy.skip>
-			</properties>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
@@ -122,26 +119,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
-						<extensions>true</extensions>
-						<configuration>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<serverId>sonatype-nexus-staging</serverId>
-							<autoReleaseAfterClose>false</autoReleaseAfterClose>
-						</configuration>
-						<executions>
-							<execution>
-							  <id>default-deploy</id>
-							  <phase>deploy</phase>
-							  <goals>
-								<goal>deploy</goal>
-							  </goals>
-							</execution>
-						  </executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.1.0</version>
+		<version>3.1.4</version>
 	</parent>
 	<dependencies>
 		<dependency>
@@ -20,9 +20,7 @@
 		<property name="headerFile" value="${checkstyle.header.file}"/>
 		<property name="fileExtensions" value="java,groovy"/>
 	</module>
-	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-		<property name="lineSeparator" value="lf"/>
-	</module>
+	<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck"/>

 	<!-- TreeWalker Checks -->
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
@@ -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.0</version>
+	<version>3.1.4</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -103,9 +103,6 @@
 		</profile>
 		<profile>
 			<id>central</id>
-			<properties>
-				<maven.deploy.skip>true</maven.deploy.skip>
-			</properties>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
@@ -154,26 +151,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.8</version>
-						<extensions>true</extensions>
-						<configuration>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<serverId>sonatype-nexus-staging</serverId>
-							<autoReleaseAfterClose>false</autoReleaseAfterClose>
-						</configuration>
-						<executions>
-							<execution>
-							  <id>default-deploy</id>
-							  <phase>deploy</phase>
-							  <goals>
-								<goal>deploy</goal>
-							  </goals>
-							</execution>
-						  </executions>
-					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
Author	SHA1	Message	Date
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
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
buildmaster	059b52a282	Bumping versions	2022-08-17 21:35:05 +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
spencergibb	2bb8d61d7d	Fixes asciidoc includes for 3.1.x	2022-02-04 14:14:07 -05:00
Artem Bilan	711fbce9ba	Remove lf from NewlineAtEndOfFileCheck Different OSs may check out files with different line separators. So, to better support other development environments it would be great to just require any end of file, not just Linux-specific.	2022-02-04 11:21:59 -05:00
spencergibb	84ecff1ac8	Updates boot version to 2.6.3	2022-02-04 11:21:22 -05:00
spencergibb	0e31343b92	move comment	2022-02-04 11:20:01 -05:00
spencergibb	ad3ddefa16	Adds .sdkmanrc	2022-01-03 14:16:50 -05:00
spencergibb	cdda8827b8	Merge branch '3.0.x'	2021-12-09 15:12:47 -05:00
Spencer Gibb	5a44935cb1	Removes nexus staging plugin (#222 )	2021-12-09 15:10:39 -05:00
buildmaster	e6b1048b95	Bumping versions	2021-12-02 08:12:42 +00:00
buildmaster	cd07e0a1e0	Bumping versions	2021-11-30 08:13:07 +00:00
buildmaster	8f44088dab	Bumping versions to 3.1.1-SNAPSHOT after release	2021-11-29 18:44:44 +00:00
buildmaster	bee859195e	Going back to snapshots	2021-11-29 18:44:43 +00:00