From 85d0f95f7a1d3e8c0322e256c812f71992233b53 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Mon, 14 Dec 2020 14:35:37 +0100
Subject: [PATCH] Start work on Spring Boot 2.5

Closes gh-24491
---
 README.adoc                       | 2 +-
 ci/README.adoc                    | 2 +-
 ci/parameters.yml                 | 2 +-
 eclipse/spring-boot-project.setup | 4 ++--
 git/hooks/prepare-forward-merge   | 2 +-
 gradle.properties                 | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.adoc b/README.adoc
index 8d2ae7d5432..1c5048fa0cf 100755
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-2.4.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-2.4.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
+= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-2.5.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-2.5.x?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 :docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 :github: https://github.com/spring-projects/spring-boot
 
diff --git a/ci/README.adoc b/ci/README.adoc
index 93540cec5d7..5d4431a9cfa 100644
--- a/ci/README.adoc
+++ b/ci/README.adoc
@@ -11,7 +11,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring-boot set-pipeline -p spring-boot-2.4.x -c ci/pipeline.yml -l ci/parameters.yml
+$ fly -t spring-boot set-pipeline -p spring-boot-2.5.x -c ci/pipeline.yml -l ci/parameters.yml
 ----
 
 NOTE: This assumes that you have credhub integration configured with the appropriate
diff --git a/ci/parameters.yml b/ci/parameters.yml
index de7fcdb94b5..b0f44444469 100644
--- a/ci/parameters.yml
+++ b/ci/parameters.yml
@@ -6,7 +6,7 @@ github-repo-name: "spring-projects/spring-boot"
 docker-hub-organization: "springci"
 artifactory-server: "https://repo.spring.io"
 branch: "master"
-milestone: "2.4.x"
+milestone: "2.5.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
diff --git a/eclipse/spring-boot-project.setup b/eclipse/spring-boot-project.setup
index 511e6abd84b..3460908b629 100644
--- a/eclipse/spring-boot-project.setup
+++ b/eclipse/spring-boot-project.setup
@@ -11,8 +11,8 @@
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/buildship/oomph/1.0 https://raw.githubusercontent.com/eclipse/buildship/master/org.eclipse.buildship.oomph/model/GradleImport-1.0.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
-    name="spring.boot.2.4.x"
-    label="Spring Boot 2.4.x">
+    name="spring.boot.2.5.x"
+    label="Spring Boot 2.5.x">
   <setupTask
       xsi:type="setup:VariableTask"
       type="FOLDER"
diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge
index 470e6d0fd5a..f8322030b0c 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
diff --git a/gradle.properties b/gradle.properties
index 3c0e2f85369..357aaba3755 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.4.2-SNAPSHOT
+version=2.5.0-SNAPSHOT
 
 org.gradle.caching=true
 org.gradle.parallel=true