From d3ef6f2382306d71aa5909cfbd3ae7f4b107fd55 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 28 May 2020 09:56:01 +0100 Subject: [PATCH] Prepare 2.3.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 7eea0af86f..f42d025dcf 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java @@ -158,7 +158,7 @@ class AsciidoctorConventions { private String determineGitHubTag(Project project) { String version = "v" + project.getVersion(); - return (version.endsWith("-SNAPSHOT")) ? "master" : version; + return (version.endsWith("-SNAPSHOT")) ? "2.3.x" : version; } /** diff --git a/ci/parameters.yml b/ci/parameters.yml index c9515ba6c1..60c8c849d9 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.3.x" milestone: "2.3.x" build-name: "spring-boot" pipeline-name: "spring-boot" 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 225d453093..038aacf127 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.3.x +:spring-boot-version: 2.3.x :github-repo: spring-projects/spring-boot :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag}