Skip to content

Commit 85d0f95

Browse files
committed
Start work on Spring Boot 2.5
Closes gh-24491
1 parent 4bb99b4 commit 85d0f95

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
= 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"]
1+
= 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"]
22
:docs: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
33
:github: https://github.com/spring-projects/spring-boot
44

ci/README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The pipeline can be deployed using the following command:
1111

1212
[source]
1313
----
14-
$ fly -t spring-boot set-pipeline -p spring-boot-2.4.x -c ci/pipeline.yml -l ci/parameters.yml
14+
$ fly -t spring-boot set-pipeline -p spring-boot-2.5.x -c ci/pipeline.yml -l ci/parameters.yml
1515
----
1616

1717
NOTE: This assumes that you have credhub integration configured with the appropriate

ci/parameters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ github-repo-name: "spring-projects/spring-boot"
66
docker-hub-organization: "springci"
77
artifactory-server: "https://repo.spring.io"
88
branch: "master"
9-
milestone: "2.4.x"
9+
milestone: "2.5.x"
1010
build-name: "spring-boot"
1111
concourse-url: "https://ci.spring.io"
1212
bintray-subject: "spring"

eclipse/spring-boot-project.setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
1212
xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
1313
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"
14-
name="spring.boot.2.4.x"
15-
label="Spring Boot 2.4.x">
14+
name="spring.boot.2.5.x"
15+
label="Spring Boot 2.5.x">
1616
<setupTask
1717
xsi:type="setup:VariableTask"
1818
type="FOLDER"

git/hooks/prepare-forward-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require 'net/http'
44
require 'yaml'
55
require 'logger'
66

7-
$master_branch = "2.4.x"
7+
$master_branch = "2.5.x"
88

99
$log = Logger.new(STDOUT)
1010
$log.level = Logger::WARN

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.4.2-SNAPSHOT
1+
version=2.5.0-SNAPSHOT
22

33
org.gradle.caching=true
44
org.gradle.parallel=true

0 commit comments

Comments
 (0)