Update SNAPSHOT to 3.0.2

Removed Bintray plugin
Bumping versions
2026-09-17 21:09:00 +00:00 · 2021-03-11 15:59:08 +00:00 · 2021-03-08 09:08:52 +01:00 · 2021-02-18 17:39:31 +00:00 · 2021-01-28 01:17:03 +00:00 · 2021-01-27 16:27:41 +00:00
9 changed files with 68 additions and 46 deletions
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2013-2018 the original author or authors.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <settings>
 	<servers>
 		<server>
@@ -31,7 +47,7 @@
 				<repository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
@@ -57,12 +73,21 @@
 				<pluginRepository>
 					<id>spring-milestones</id>
 					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
+					<url>https://repo.spring.io/milestone</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
 			</pluginRepositories>
 		</profile>
+		<profile>
+			<!--
+				Turns on jdk8 for tests
+			-->
+			<id>ide</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+		</profile>
 	</profiles>
 </settings>
@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0-M4</version>
+		<version>3.0.2</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -1,3 +1,3 @@
-:jdkversion: 1.7
+:jdkversion: 1.8

 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base.adoc[]
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;

 /**
 * @author Marcin Grzejszczak
@@ -127,7 +128,7 @@ public class Main {

 		public String description;

-		public Object defaultValue;
+		public String defaultValue;

 		ConfigValue() {
 		}
@@ -143,7 +144,7 @@ public class Main {
 		}

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

 	}
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.0.0-M4</version>
+	<version>3.0.2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,20 +28,22 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.4.0-M3</spring-boot.version>
-		<spring-cloud-build.version>3.0.0-M4</spring-cloud-build.version>
+		<spring-boot.version>2.4.3</spring-boot.version>
+		<spring-cloud-build.version>3.0.2</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.version>0.1.3.RELEASE
-		</spring-asciidoctor-extensions.version>
-		<asciidoctorj-pdf.version>1.5.0-alpha.18</asciidoctorj-pdf.version>
+		<spring-asciidoctor-extensions-boot.version>0.5.0
+		</spring-asciidoctor-extensions-boot.version>
+		<spring-asciidoctor-extensions-block.version>0.5.0
+		</spring-asciidoctor-extensions-block.version>
+		<asciidoctorj-pdf.version>1.5.3</asciidoctorj-pdf.version>
 		<asciidoctorj-diagram.version>2.0.2</asciidoctorj-diagram.version>
 		<guides-project.version>${project.version}</guides-project.version>
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
-		<asciidoctorj.version>2.4.0</asciidoctorj.version>
+		<asciidoctorj.version>2.4.1</asciidoctorj.version>
 		<jruby-complete.version>9.2.7.0</jruby-complete.version>

 		<!-- Sonar -->
@@ -59,11 +61,12 @@
 		<puppycrawl-tools-checkstyle.version>8.29</puppycrawl-tools-checkstyle.version>
 		<spring-javaformat.version>0.0.25</spring-javaformat.version>
 		<maven-failsafe-plugin.version>2.22.1</maven-failsafe-plugin.version>
-		<maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
-		<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+		<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
+		<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
 		<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
 		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
 		<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+		<maven-surefire-report-plugin.version>3.0.0-M5</maven-surefire-report-plugin.version>
 		<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
 		<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
 		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -72,7 +75,7 @@
 		<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 		<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
-		<asciidoctor-maven-plugin.version>2.0.0</asciidoctor-maven-plugin.version>
+		<asciidoctor-maven-plugin.version>2.1.0</asciidoctor-maven-plugin.version>
 		<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
 		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
@@ -666,6 +669,16 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>${maven-surefire-report-plugin.version}</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>3.0.0</version>
+			</plugin>
 		</plugins>
 	</reporting>
 	<distributionManagement>
@@ -718,11 +731,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</repository>
-				<repository>
-					<id>spring-plugins</id>
-					<name>Spring Maven Plugins Repository</name>
-					<url>https://repo.spring.io/plugins-release</url>
-				</repository>
 			</repositories>
 			<pluginRepositories>
 				<pluginRepository>
@@ -767,18 +775,6 @@
 				<maven-deploy-plugin.deployZipUrl>https://repo.spring.io/libs-milestone-local</maven-deploy-plugin.deployZipUrl>
 			</properties>
 		</profile>
-		<profile>
-			<id>bintray</id>
-			<distributionManagement>
-				<repository>
-					<id>bintray</id>
-					<name>Jcenter Repository</name>
-					<url>
-						https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package}
-					</url>
-				</repository>
-			</distributionManagement>
-		</profile>
 		<profile>
 			<id>central</id>
 			<build>
@@ -1090,8 +1086,13 @@
 							<dependencies>
 								<dependency>
 									<groupId>io.spring.asciidoctor</groupId>
-									<artifactId>spring-asciidoctor-extensions</artifactId>
-									<version>${spring-asciidoctor-extensions.version}</version>
+									<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>
@@ -1174,7 +1175,6 @@
 										</sourceDocumentExtensions>
 										<outputDirectory>${generated-docs-multipage-output.dir}
 										</outputDirectory>
-										<sourceHighlighter>highlight.js</sourceHighlighter>
 										<doctype>book</doctype>
 										<attributes>
 											<docinfo>shared</docinfo>
@@ -1186,6 +1186,7 @@
 											<highlightjs-theme>github</highlightjs-theme>
 											<imagesdir>./images</imagesdir>
 											<attribute-missing>warn</attribute-missing>
+											<sourceHighlighter>highlight.js</sourceHighlighter>
 										</attributes>
 										<logHandler>
 											<outputToConsole>true</outputToConsole>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>3.0.0-M4</version>
+	<version>3.0.2</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.4.0-M3</version>
+		<version>2.4.3</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.4.0-M3</spring-boot.version>
+		<spring-boot.version>2.4.3</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0-M4</version>
+		<version>3.0.2</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.0.0-M4</version>
+	<version>3.0.2</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
Author	SHA1	Message	Date
buildmaster	f578303c08	Update SNAPSHOT to 3.0.2	2021-03-11 15:59:08 +00:00
Marcin Grzejszczak	39a1c393e4	Removed Bintray plugin	2021-03-08 09:08:52 +01:00
buildmaster	ba39434f18	Bumping versions	2021-02-18 17:39:31 +00:00
buildmaster	b0aea38029	Bumping versions	2021-01-28 01:17:03 +00:00
buildmaster	258905c660	Bumping versions to 3.0.2-SNAPSHOT after release	2021-01-27 16:27:41 +00:00
buildmaster	540d3b3fe5	Going back to snapshots	2021-01-27 16:27:41 +00:00
buildmaster	85e6ea2365	Update SNAPSHOT to 3.0.1	2021-01-27 16:25:55 +00:00
Ryan Baxter	4711b1780d	Use org security policy	2021-01-21 13:54:59 -05:00
Marcin Grzejszczak	88b45f7791	Bumped Asciidoctor Maven Plugin to 2.1.0 (we need asciidoctorj > 2.4.0)	2021-01-05 11:08:42 +01:00
buildmaster	90a515199e	Bumping versions	2020-12-22 18:08:13 +00:00
buildmaster	91299a3bee	Bumping versions	2020-12-22 17:56:45 +00:00
buildmaster	6979da58be	Bumping versions	2020-12-22 07:12:21 +00:00
spencergibb	2d256aa0f2	Updates version to 3.0.1-SNAPSHOT	2020-12-21 13:12:05 -05:00
buildmaster	dea13a0f84	Bumping versions	2020-12-19 07:12:38 +00:00
buildmaster	e5443ccf45	Bumping versions to 3.0.1.SNAPSHOT after release	2020-12-19 00:06:59 +00:00
buildmaster	cb21c9a698	Going back to snapshots	2020-12-19 00:06:58 +00:00
buildmaster	e0b2f352b5	Update SNAPSHOT to 3.0.0	2020-12-19 00:05:24 +00:00
Marcin Grzejszczak	d5f63ece97	Removed plugins repo	2020-12-18 09:47:16 +01:00
buildmaster	1f8f123fd9	Bumping versions	2020-12-14 21:38:44 +00:00
Jonatan Ivanov	4901a73b7f	Updating docs: Java 8 instead of 7 (#208 )	2020-12-14 08:49:53 +01:00
buildmaster	372317bca0	Going back to snapshots	2020-12-10 21:10:02 +00:00
buildmaster	8889bffd19	Update SNAPSHOT to 3.0.0-RC1	2020-12-10 21:09:00 +00:00
Marcin Grzejszczak	c909aacff9	Merge branch '2.3.x'	2020-12-09 17:40:10 +01:00
Marcin Grzejszczak	1506765f75	Changed the plugins-release repo to plugins	2020-12-09 17:39:56 +01:00
buildmaster	900a46748e	Going back to snapshots	2020-12-01 20:53:55 +00:00
buildmaster	879b9a6053	Update SNAPSHOT to 3.0.0-M6	2020-12-01 20:52:52 +00:00
Marcin Grzejszczak	6d5d80ae45	Fixed the invalid default value code formatting	2020-11-26 08:29:56 +01:00
Marcin Grzejszczak	0c5b190e42	Fixed the invalid default value code formatting	2020-11-19 09:47:36 +01:00
buildmaster	a4b139316e	Going back to snapshots	2020-11-17 09:23:47 +00:00
buildmaster	7c6d77cf7f	Update SNAPSHOT to 3.0.0-M5	2020-11-17 09:22:32 +00:00
Marcin Grzejszczak	313b7907de	Updated settings.xml, changed code formatting for default values	2020-11-16 14:24:27 +01:00
Marcin Grzejszczak	80b1c9a661	Code for the default value	2020-11-16 14:14:49 +01:00
buildmaster	5f75067cc2	Bumping versions	2020-11-12 19:58:53 +00:00
Marcin Grzejszczak	701bdc5f63	Moved the source highlighter	2020-11-10 15:26:17 +01:00
Marcin Grzejszczak	84afd82e17	Updated ascidoctorj	2020-11-10 14:14:57 +01:00
Marcin Grzejszczak	74bee7a6c3	Updated asciidoctor extensions	2020-11-10 09:28:07 +01:00
dependabot-preview[bot]	7da8e0c07b	Bump maven-source-plugin from 3.0.1 to 3.2.1 (#184 ) Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.0.1 to 3.2.1. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.0.1...maven-source-plugin-3.2.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-11-03 13:03:23 -05:00
dependabot-preview[bot]	6ee50db4e6	Bump maven-javadoc-plugin from 3.1.0 to 3.2.0 (#199 ) Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.1.0...maven-javadoc-plugin-3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-11-03 11:16:38 +01:00
dependabot-preview[bot]	316c9cd491	Bump maven-jxr-plugin from 2.1 to 3.0.0 (#200 ) Bumps [maven-jxr-plugin](https://github.com/apache/maven-jxr) from 2.1 to 3.0.0. - [Release notes](https://github.com/apache/maven-jxr/releases) - [Commits](https://github.com/apache/maven-jxr/compare/jxr-2.1...jxr-3.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-11-03 11:16:24 +01:00
dependabot-preview[bot]	f9f0b41e6c	Bump asciidoctorj-pdf from 1.5.0-alpha.18 to 1.5.3 (#201 ) Bumps [asciidoctorj-pdf](https://github.com/asciidoctor/asciidoctorj) from 1.5.0-alpha.18 to 1.5.3. - [Release notes](https://github.com/asciidoctor/asciidoctorj/releases) - [Changelog](https://github.com/asciidoctor/asciidoctorj/blob/master/CHANGELOG.adoc) - [Commits](https://github.com/asciidoctor/asciidoctorj/commits/v1.5.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-11-03 11:16:03 +01:00
buildmaster	357a804cea	Bumping versions	2020-11-02 18:10:42 +00:00
Marcin Grzejszczak	17db2e46fb	Downgraded checkstyle; added surefire-report plugin	2020-11-02 14:31:47 +01:00
Marcin Grzejszczak	b155afba9e	Revert "Bump checkstyle from 8.29 to 8.37 (#198 )" This reverts commit `7cf69ff3ed`.	2020-11-02 14:16:25 +01:00
dependabot-preview[bot]	7cf69ff3ed	Bump checkstyle from 8.29 to 8.37 (#198 ) Bumps [checkstyle](https://github.com/checkstyle/checkstyle) from 8.29 to 8.37. - [Release notes](https://github.com/checkstyle/checkstyle/releases) - [Commits](https://github.com/checkstyle/checkstyle/compare/checkstyle-8.29...checkstyle-8.37) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>	2020-11-02 09:47:06 +01:00
buildmaster	6032a90a22	Bumping versions	2020-10-16 15:48:29 +00:00
buildmaster	7c8ae3600e	Bumping versions	2020-09-29 14:50:47 +00:00
buildmaster	784bf6c07d	Bumping versions	2020-09-24 07:12:15 +00:00
buildmaster	db077cc8dd	Going back to snapshots	2020-09-23 11:02:25 +00:00
Olga Maciaszek-Sharma	09bc053a02	Fix artifact version.	2020-08-03 12:09:35 +02:00
buildmaster	2631bd9e4f	Bumping versions to 2.3.2.SNAPSHOT after release	2020-07-30 16:56:05 +00:00
buildmaster	c2ef62de73	Going back to snapshots	2020-07-30 16:56:04 +00:00
buildmaster	a247cbcfae	Update SNAPSHOT to 2.3.1.RELEASE	2020-07-30 16:47:53 +00:00
Ryan Baxter	c08320254e	Revert "Use https://repo.spring.io/snapshot " This reverts commit `fc23298240`.	2020-07-30 10:29:22 -04:00
Ryan Baxter	e296686584	Revert "Changing to https://repo.spring.io/snapshot " This reverts commit `d4a54620b8`.	2020-07-30 10:28:32 -04:00
spencergibb	53fd3a14c8	Bumps boot to version to 2.3.2.RELEASE	2020-07-30 10:06:50 -04:00