Update SNAPSHOT to 3.1.0-M1

Using Boot 2.6.0-M1
Adding plugin repositories to docs profile
2026-09-17 21:09:00 +00:00 · 2021-07-23 00:39:40 +00:00 · 2021-07-22 20:33:25 -04:00 · 2021-07-22 20:06:34 -04:00 · 2021-07-16 15:41:27 +02:00 · 2021-07-15 14:00:22 -04:00
10 changed files with 84 additions and 54 deletions
@@ -32,4 +32,4 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-maven-
      - name: Build with Maven
-        run: ./mvnw clean install -B -U
+        run: ./mvnw clean install -B -U -Pspring
@@ -1 +0,0 @@
-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot -P spring
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.1.0-M1</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -85,7 +85,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
+				<version>${maven-deploy-plugin.version}</version>
 			</plugin>
 		</plugins>
 	</build>
@@ -1 +0,0 @@
-spring-cloud-build.adoc
@@ -0,0 +1 @@
+include::spring-cloud-build.adoc[]
@@ -51,15 +51,17 @@ public class ReadmeMain {
 	}

 	private Options options(File input, File output) {
-		Attributes attributes = new Attributes();
-		attributes.setAllowUriRead(true);
-		attributes.setAttribute("project-root", output.getParent());
-		Options options = new Options();
-		options.setSourceDir(input.getParent());
-		options.setBaseDir(input.getParent());
-		options.setAttributes(attributes);
-		options.setSafe(SafeMode.UNSAFE);
-		options.setParseHeaderOnly(true);
-		return options;
+		Attributes attributes = Attributes.builder()
+				.allowUriRead(true)
+				.attribute("project-root", output.getParent())
+				.build();
+
+		return Options.builder()
+				.sourceDir(input.getParentFile())
+				.baseDir(input.getParentFile())
+				.attributes(attributes)
+				.safe(SafeMode.UNSAFE)
+				.parseHeaderOnly(true)
+				.build();
 	}
 }
@@ -7,7 +7,6 @@ import java.nio.file.Files;

 import org.junit.jupiter.api.Test;

-import static org.assertj.core.api.Assertions.registerCustomDateFormat;
 import static org.assertj.core.api.BDDAssertions.then;

 class ReadmeMainTests {
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>3.0.3</version>
+	<version>3.1.0-M1</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,23 +28,23 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>2.4.6</spring-boot.version>
-		<spring-cloud-build.version>3.0.3</spring-cloud-build.version>
+		<spring-boot.version>2.6.0-M1</spring-boot.version>
+		<spring-cloud-build.version>3.1.0-M1</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.5.0
+		<spring-asciidoctor-extensions-boot.version>0.6.0
 		</spring-asciidoctor-extensions-boot.version>
-		<spring-asciidoctor-extensions-block.version>0.5.0
+		<spring-asciidoctor-extensions-block.version>0.6.0
 		</spring-asciidoctor-extensions-block.version>
-		<asciidoctorj-pdf.version>1.5.3</asciidoctorj-pdf.version>
-		<asciidoctorj-diagram.version>2.0.2</asciidoctorj-diagram.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>
 		<guides-update.phase>deploy</guides-update.phase>
 		<revision>${project.version}</revision>
-		<asciidoctorj.version>2.4.1</asciidoctorj.version>
-		<jruby-complete.version>9.2.7.0</jruby-complete.version>
+		<asciidoctorj.version>2.5.1</asciidoctorj.version>
+		<jruby-complete.version>9.2.19.0</jruby-complete.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -58,31 +58,31 @@
 		<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
 		<!-- for backwards compatibility, use maven-checkstyle-plugin.version -->
 		<checkstyle.version>${maven-checkstyle-plugin.version}</checkstyle.version>
-		<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.2.0</maven-javadoc-plugin.version>
+		<puppycrawl-tools-checkstyle.version>8.43</puppycrawl-tools-checkstyle.version>
+		<spring-javaformat.version>0.0.26</spring-javaformat.version>
+		<maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
+		<maven-javadoc-plugin.version>3.3.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><!-- @releaser:version-check-off -->
+		<maven-surefire-report-plugin.version>2.22.2</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>
-		<git-commit-id-plugin.version>3.0.0</git-commit-id-plugin.version>
+		<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+		<git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
 		<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
-		<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
-		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-		<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
+		<maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version><!-- @releaser:version-check-off -->
+		<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+		<maven-dependency-plugin.version>3.2.0</maven-dependency-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>
-		<spring-javaformat-checkstyle.version>0.0.25</spring-javaformat-checkstyle.version>
-		<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
-		<pitest-maven.version>1.5.2</pitest-maven.version>
-		<pitest-junit5-plugin.version>0.12</pitest-junit5-plugin.version>
+		<build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
+		<artifactory-maven-plugin.version>3.2.0</artifactory-maven-plugin.version>
+		<license-maven-plugin.version>2.0.0</license-maven-plugin.version>
+		<spring-javaformat-checkstyle.version>0.0.26</spring-javaformat-checkstyle.version>
+		<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+		<pitest-maven.version>1.6.7</pitest-maven.version>
+		<pitest-junit5-plugin.version>0.14</pitest-junit5-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true
@@ -100,7 +100,7 @@
 		<checkstyle.additional.suppressions.file>
 			${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml
 		</checkstyle.additional.suppressions.file>
-		<nohttp-checkstyle.version>0.0.5.RELEASE</nohttp-checkstyle.version>
+		<nohttp-checkstyle.version>0.0.7</nohttp-checkstyle.version>
 		<disable.nohttp.checks>true</disable.nohttp.checks>
 		<antelopetasks.version>3.2.10</antelopetasks.version>
 		<ant-nodeps.version>1.8.1</ant-nodeps.version>
@@ -114,12 +114,13 @@
 		<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.version>2.7</maven-deploy-plugin.version>
+		<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>
 		<upload-docs-zip.phase>none</upload-docs-zip.phase>
 		<readme.main.classpath>${docs.classes.dir}</readme.main.classpath>
 		<readme.class.path>readme.class.path</readme.class.path>
+		<sonar-jacoco-listeners.version>5.14.0.18788</sonar-jacoco-listeners.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -141,7 +142,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-				Copyright 2014-2015 the original author or authors.
+				Copyright 2014-2021 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.
@@ -1435,6 +1436,35 @@
 					</plugins>
 				</pluginManagement>
 			</build>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/snapshot</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/milestone</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
 		</profile>
 		<profile>
 			<id>sonar</id>
@@ -1479,7 +1509,7 @@
 				<dependency>
 					<groupId>org.sonarsource.java</groupId>
 					<artifactId>sonar-jacoco-listeners</artifactId>
-					<version>3.8</version>
+					<version>${sonar-jacoco-listeners.version}</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-dependencies</artifactId>
-	<version>3.0.3</version>
+	<version>3.1.0-M1</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.6</version>
+		<version>2.6.0-M1</version>
 		<relativePath/>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-boot.version>2.4.6</spring-boot.version>
+		<spring-boot.version>2.6.0-M1</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -119,7 +119,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.6</version>
+						<version>${maven-gpg-plugin.version}</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.1.0-M1</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.3</version>
+	<version>3.1.0-M1</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -19,7 +19,7 @@
 			<name>Apache License, Version 2.0</name>
 			<url>https://www.apache.org/licenses/LICENSE-2.0</url>
 			<comments>
-				Copyright 2014-2015 the original author or authors.
+				Copyright 2014-2021 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.
@@ -242,7 +242,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-enforcer-plugin</artifactId>
-					<version>1.4.1</version>
+					<version>${maven-enforcer-plugin.version}</version>
 					<executions>
 						<execution>
 							<id>enforce-versions</id>
Author	SHA1	Message	Date
buildmaster	f6e8e4b71b	Update SNAPSHOT to 3.1.0-M1	2021-07-23 00:39:40 +00:00
Ryan Baxter	f9386aa621	Using Boot 2.6.0-M1	2021-07-22 20:33:25 -04:00
Ryan Baxter	74fc896653	Adding plugin repositories to docs profile	2021-07-22 20:06:34 -04:00
Marcin Grzejszczak	a074b31b30	Downgrading exec-maven-plugin to speed up our builds Currently with the updated plugin we're trying to fetch jars with a http:// URL	2021-07-16 15:41:27 +02:00
Spencer Gibb	f1ec549ce6	Downgrade maven failsafe plugin	2021-07-15 14:00:22 -04:00
Olga MaciaszekSharma	216746d39b	Downgrade surefire-plugin and surefire-reporting-plugin to 2.22.2.	2021-07-15 19:24:18 +02:00
Marcin Grzejszczak	b41d78f5c6	Bumped jacoco	2021-07-13 10:22:02 +02:00
Marcin Grzejszczak	9247f06db2	Bumped versions of libs (#215 )	2021-07-13 10:02:16 +02:00
Marcin Grzejszczak	3af8d0feae	Adds -Pspring to maven build command	2021-07-12 12:40:28 +02:00
Marcin Grzejszczak	8d16702238	Fixde workflows	2021-07-12 12:37:05 +02:00
Spencer Gibb	8de921489f	Replace symlink with include (#214 ) * removed index.adoc symlink * Replace symlink with include	2021-07-12 12:06:02 +02:00
spencergibb	8a2deb21d6	Updates boot to version 2.6.0-SNAPSHOT	2021-07-08 14:46:11 -04:00
spencergibb	82954c4313	Merge branch '3.1.x'	2021-07-08 14:34:48 -04:00
Christianandcgerrard	3b59bc688c	Updating asciidoctorJ versions, handling deprecated constructors, removing unused import. (#213 ) Co-authored-by: cgerrard <christian@nomena.io>	2021-07-01 12:36:19 +02:00
buildmaster	00f1b3426f	Bumping versions	2021-06-22 00:03:58 +00:00
buildmaster	e2021b552a	Bumping versions	2021-06-11 08:12:58 +00:00
buildmaster	0b717b0c61	Bumping versions	2021-06-10 16:30:09 +00:00
buildmaster	6ff762f675	Bumping versions	2021-05-28 08:12:56 +00:00
buildmaster	5d61e6f832	Bumping versions	2021-05-27 08:12:43 +00:00
buildmaster	c109e0520e	Bumping versions to 3.0.4-SNAPSHOT after release	2021-05-26 12:49:50 +00:00
buildmaster	d1470dd08a	Going back to snapshots	2021-05-26 12:49:50 +00:00
Olga MaciaszekSharma	d1f60f83b6	Merge remote-tracking branch 'main' into 3.1.x	2021-05-13 12:54:45 +02:00
Olga MaciaszekSharma	8d406e1e3f	Add GH actions setup.	2021-05-13 12:27:26 +02:00
Olga MaciaszekSharma	b6286b926e	Revert "Try building with docs on Circle." This reverts commit `2d1f2b3e11`.	2021-05-13 12:24:48 +02:00
Olga MaciaszekSharma	2d1f2b3e11	Try building with docs on Circle.	2021-05-13 12:23:06 +02:00
Olga MaciaszekSharma	2b254a0769	Add debug flag.	2021-05-13 12:16:55 +02:00
Olga MaciaszekSharma	a3d39519d9	Init 3.1.x.	2021-05-13 12:01:08 +02:00
				`@@ -1 +0,0 @@`
				`-DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/snapshot -P spring`