root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x 

See gh-23962
This commit is contained in:
Stephane Nicoll 2020-10-29 09:33:37 +01:00
parent a8db6a8a83 6c0fc7f195
commit 770b5f4528
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/scripts/stage.sh
View File

@ -50,7 +50,7 @@ run_maven -f spring-boot-tests/spring-boot-deployment-tests/pom.xml clean instal
git reset --hard HEAD^ > /dev/null git reset --hard HEAD^ > /dev/null
if [[ $nextVersion != $snapshotVersion ]]; then if [[ $nextVersion != $snapshotVersion ]]; then
echo "Setting next development version (v$nextVersion)" echo "Setting next development version (v$nextVersion)"
set_revision_to_pom "$nextVersion" set_revision "$nextVersion"
git add pom.xml > /dev/null git add pom.xml > /dev/null
git commit -m"Next development version (v$nextVersion)" > /dev/null git commit -m"Next development version (v$nextVersion)" > /dev/null
fi; fi;