Prepare 2.6.x branch

wilkinsona · wilkinsona · commit 354a18c9a632 · 2021-11-30T10:36:19.000Z
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
@@ -138,7 +138,7 @@ private void configureCommonAttributes(Project project, AbstractAsciidoctorTask
 
 	private String determineGitHubTag(Project project) {
 		String version = "v" + project.getVersion();
-		return (version.endsWith("-SNAPSHOT")) ? "main" : version;
+		return (version.endsWith("-SNAPSHOT")) ? "2.6.x" : version;
 	}
 
 	private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {
diff --git a/ci/parameters.yml b/ci/parameters.yml
@@ -6,7 +6,7 @@ github-repo-name: "spring-projects/spring-boot"
 homebrew-tap-repo: "https://github.com/spring-io/homebrew-tap.git"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
-branch: "main"
+branch: "2.6.x"
 milestone: "2.6.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private void configureCommonAttributes(Project project, AbstractAsciidoctorTask`
`138`	`138`
`139`	`139`	`private String determineGitHubTag(Project project) {`
`140`	`140`	`String version = "v" + project.getVersion();`
`141`		`- return (version.endsWith("-SNAPSHOT")) ? "main" : version;`
	`141`	`+ return (version.endsWith("-SNAPSHOT")) ? "2.6.x" : version;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private void configureOptions(AbstractAsciidoctorTask asciidoctorTask) {`