Merge branch '2.7.x' into 3.0.x

Closes gh-38400

Author: wilkinsona

ci/parameters.yml

@@ -12,3 +12,4 @@ milestone: "3.0.x"
 build-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
 task-timeout: 2h00m
+final-release: false

ci/pipeline.yml

@@ -402,6 +402,7 @@ jobs:
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
+      FINAL_RELEASE: ((final-release))
       RELEASE_TYPE: M
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
@@ -425,6 +426,7 @@ jobs:
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
+      FINAL_RELEASE: ((final-release))
       RELEASE_TYPE: RC
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params
@@ -448,6 +450,7 @@ jobs:
     timeout: ((task-timeout))
     file: git-repo/ci/tasks/stage.yml
     params:
+      FINAL_RELEASE: ((final-release))
       RELEASE_TYPE: RELEASE
       <<: *gradle-enterprise-task-params
       <<: *docker-hub-task-params

ci/scripts/stage.sh

@@ -38,7 +38,7 @@ git tag -a "v$stageVersion" -m"Release v$stageVersion" > /dev/null
 ./gradlew --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
 
 git reset --hard HEAD^ > /dev/null
-if [[ $nextVersion != $snapshotVersion ]]; then
+if [[ $FINAL_RELEASE != true && $nextVersion != $snapshotVersion ]]; then
 	echo "Setting next development version (v$nextVersion)"
 	sed -i "s/version=$snapshotVersion/version=$nextVersion/" gradle.properties
 	git add gradle.properties > /dev/null

ci/tasks/stage.yml

@@ -8,6 +8,7 @@ outputs:
 params:
   RELEASE_TYPE:
   CI: true
+  FINAL_RELEASE:
   GRADLE_ENTERPRISE_CACHE_URL:
   GRADLE_ENTERPRISE_CACHE_USERNAME:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: