Fixing pointers to correct branch

Merge branch '3.0.x' of github.com:spring-cloud/spring-cloud-build into 3.0.x
Using Boot 2.4.13
2026-09-17 21:09:00 +00:00 · 2022-02-10 10:28:49 -05:00 · 2021-12-14 10:49:19 -05:00 · 2021-12-14 10:48:31 -05:00 · 2021-12-10 20:11:41 +00:00 · 2021-12-10 20:11:41 +00:00
11 changed files with 39 additions and 62 deletions
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.6-SNAPSHOT</version>
 	</parent>
 	<properties>
 		<docs.main>spring-cloud-build</docs.main>
@@ -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.0.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.0.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.0.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.0.x/docs/src/main/asciidoc/building-base.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 {
@@ -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.0.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.0.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.0.3</version>
+	<version>3.0.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring
@@ -28,22 +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.6</spring-boot.version>
-		<spring-cloud-build.version>3.0.3</spring-cloud-build.version>
+		<spring-boot.version>2.4.13</spring-boot.version>
+		<spring-cloud-build.version>3.0.6-SNAPSHOT</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>
+		<asciidoctorj.version>2.5.1</asciidoctorj.version>
 		<jruby-complete.version>9.2.7.0</jruby-complete.version>

 		<!-- Sonar -->
@@ -692,7 +692,7 @@
 		<repository>
 			<id>sonatype-nexus-staging</id>
 			<name>Nexus Release Repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
 		</repository>
 		<snapshotRepository>
 			<id>repo.spring.io</id>
@@ -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.0.6-SNAPSHOT</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.4.13</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.4.13</spring-boot.version>
 	</properties>
 	<build>
 		<plugins>
@@ -62,7 +62,7 @@
 		<site>
 			<id>spring-docs</id>
 			<url>
-				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+				https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
 			</url>
 		</site>
 		<repository>
@@ -87,30 +87,18 @@
 				</repository>
 			</distributionManagement>
 		</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>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
 					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 					</url>
 				</repository>
 			</distributionManagement>
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.3</version>
+		<version>3.0.6-SNAPSHOT</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.0.6-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -76,7 +76,7 @@
 		<site>
 			<id>spring-docs</id>
 			<url>
-				scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version}
+				https:/docs.spring.io/${project.artifactId}/docs/${project.version}/reference/html/
 			</url>
 		</site>
 		<repository>
@@ -101,30 +101,18 @@
 				</repository>
 			</distributionManagement>
 		</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>
 			<distributionManagement>
 				<snapshotRepository>
 					<id>sonatype-nexus-snapshots</id>
 					<name>Sonatype Nexus Snapshots</name>
-					<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+					<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
 				</snapshotRepository>
 				<repository>
 					<id>sonatype-nexus-staging</id>
 					<name>Nexus Release Repository</name>
-					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
+					<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
 					</url>
 				</repository>
 			</distributionManagement>
Author	SHA1	Message	Date
Ryan Baxter	58fe9dff85	Fixing pointers to correct branch	2022-02-10 10:28:49 -05:00
Ryan Baxter	cc3685b5ff	Merge branch '3.0.x' of github.com:spring-cloud/spring-cloud-build into 3.0.x	2021-12-14 10:49:19 -05:00
Ryan Baxter	99e4ee2791	Using Boot 2.4.13	2021-12-14 10:48:31 -05:00
buildmaster	7960973422	Bumping versions to 3.0.6-SNAPSHOT after release	2021-12-10 20:11:41 +00:00
buildmaster	9bf8bd0547	Going back to snapshots	2021-12-10 20:11:41 +00:00
buildmaster	e9d2b4a5bb	Update SNAPSHOT to 3.0.5	2021-12-10 20:10:21 +00:00
Spencer Gibb	5a44935cb1	Removes nexus staging plugin (#222 )	2021-12-09 15:10:39 -05:00
Marcin Grzejszczak	74842d8a7f	Uses nexus staging plugin to deploy to central (#216 ) * Uses nexus staging plugin to deploy to central * Don't automatically close	2021-11-23 15:25:26 -05:00
buildmaster	3e6b8144b6	Bumping versions to 3.0.5-SNAPSHOT after release	2021-09-20 14:09:33 +00:00
buildmaster	b2b9e8fa90	Going back to snapshots	2021-09-20 14:09:33 +00:00
buildmaster	e52df5d684	Update SNAPSHOT to 3.0.4	2021-09-20 14:07:37 +00:00
Olga MaciaszekSharma	5a19120508	Upgrade Boot to 2.4.10.	2021-09-20 15:05:57 +02:00
spencergibb	d6ba904dcc	Updates boot to 2.4.10-SNAPSHOT fix for spring-amqp spring-integration version mismatch	2021-07-26 17:49:15 -04:00
spencergibb	c154f40cdf	Updates boot to 2.4.9	2021-07-26 12:56:48 -04:00
Marcin Grzejszczak	ad51c6b78f	Bumping boot to 2.4.8	2021-07-20 16:37:38 +02: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