From 08b692581a963848012af373f751c7d34da3b012 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Dec 2020 14:22:07 +0100 Subject: [PATCH 1/2] Prepare 2.4.x branch --- .../springframework/boot/build/AsciidoctorConventions.java | 2 +- ci/parameters.yml | 2 +- .../spring-boot-docs/src/docs/asciidoc/attributes.adoc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java index 3bd7757ba4..88b78fa0a1 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java @@ -166,7 +166,7 @@ class AsciidoctorConventions { private String determineGitHubTag(Project project) { String version = "v" + project.getVersion(); - return (version.endsWith("-SNAPSHOT")) ? "master" : version; + return (version.endsWith("-SNAPSHOT")) ? "2.4.x" : version; } /** diff --git a/ci/parameters.yml b/ci/parameters.yml index de7fcdb94b..eb0702e774 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -5,7 +5,7 @@ github-repo: "https://github.com/spring-projects/spring-boot.git" github-repo-name: "spring-projects/spring-boot" docker-hub-organization: "springci" artifactory-server: "https://repo.spring.io" -branch: "master" +branch: "2.4.x" milestone: "2.4.x" build-name: "spring-boot" concourse-url: "https://ci.spring.io" diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc index 5d462562d4..2707a1bffc 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc @@ -12,8 +12,8 @@ :docinfo: shared,private :spring-boot-artifactory-repo: snapshot -:github-tag: master -:spring-boot-version: current +:github-tag: 2.4.x +:spring-boot-version: 2.4.x :github-repo: spring-projects/spring-boot :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} From 40fd71bc05127b41f8d54b0c66dcaef976e9a06b Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 14 Dec 2020 14:31:25 +0100 Subject: [PATCH 2/2] Switch master branch to 2.5.x --- git/hooks/prepare-forward-merge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index 470e6d0fd5..f8322030b0 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -4,7 +4,7 @@ require 'net/http' require 'yaml' require 'logger' -$master_branch = "2.4.x" +$master_branch = "2.5.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN