From 6945d3df2673ebf0c0aa08e2066919b543184843 Mon Sep 17 00:00:00 2001
From: Spring Builds <spring-builds@users.noreply.github.com>
Date: Thu, 19 Oct 2023 06:49:32 +0000
Subject: [PATCH 1/3] Next development version (v2.7.18-SNAPSHOT)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a1878293b244..b745931ba412 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.7.17-SNAPSHOT
+version=2.7.18-SNAPSHOT
 
 org.gradle.caching=true
 org.gradle.parallel=true

From 8b6b6378f53cef91f310063d2e7ce810c0dcc8f9 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 19 Oct 2023 08:10:04 +0100
Subject: [PATCH 2/3] Polish CI pipeline

---
 ci/config/release-scripts.yml | 2 +-
 ci/pipeline.yml               | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/ci/config/release-scripts.yml b/ci/config/release-scripts.yml
index c89e84e52663..207ae802c063 100644
--- a/ci/config/release-scripts.yml
+++ b/ci/config/release-scripts.yml
@@ -3,7 +3,7 @@ spring:
     banner-mode: off
 sonatype:
   exclude:
-    - "build-info\.json"
+    - "build-info.json"
     - "org/springframework/boot/spring-boot-docs/.*"
 sdkman:
   artifact: "org.springframework.boot:spring-boot-cli:*:zip:bin"
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 450d35db7cad..632207e0a4fe 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -580,7 +580,6 @@ jobs:
 - name: promote-milestone
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -590,7 +589,6 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: M
@@ -609,7 +607,6 @@ jobs:
 - name: promote-rc
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -619,7 +616,6 @@ jobs:
       download_artifacts: false
       save_build_info: true
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RC
@@ -638,7 +634,6 @@ jobs:
 - name: promote-release
   serial: true
   plan:
-  - get: ci-image
   - get: git-repo
     trigger: false
   - get: artifactory-repo
@@ -649,7 +644,6 @@ jobs:
       save_build_info: true
       threads: 8
   - task: promote
-    image: ci-image
     file: git-repo/ci/tasks/promote.yml
     params:
       RELEASE_TYPE: RELEASE
@@ -697,7 +691,6 @@ jobs:
 - name: publish-to-sdkman
   serial: true
   plan:
-    - get: ci-image
     - get: git-repo
     - get: artifactory-repo
       passed: [create-github-release]
@@ -705,7 +698,6 @@ jobs:
         download_artifacts: false
         save_build_info: true
     - task: publish-to-sdkman
-      image: ci-image
       file: git-repo/ci/tasks/publish-to-sdkman.yml
       params:
         <<: *sdkman-task-params

From fe69930ac7c9947bd45d6016d13819797339df12 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 19 Oct 2023 09:20:00 +0100
Subject: [PATCH 3/3] Correct configuration of Sonatype credentials used for
 promotion

---
 ci/pipeline.yml      | 2 +-
 ci/tasks/promote.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 632207e0a4fe..1bcf1043eaef 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -28,7 +28,7 @@ anchors:
     GITHUB_USERNAME: ((github-username))
     MILESTONE: ((milestone))
   sontatype-task-params: &sonatype-task-params
-    SONATYPE_USER: ((sonatype-username))
+    SONATYPE_USERNAME: ((sonatype-username))
     SONATYPE_PASSWORD: ((sonatype-password))
     SONATYPE_URL: ((sonatype-url))
     SONATYPE_STAGING_PROFILE_ID: ((sonatype-staging-profile-id))
diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml
index 976df569c4b4..aa700a1bf11f 100644
--- a/ci/tasks/promote.yml
+++ b/ci/tasks/promote.yml
@@ -17,7 +17,7 @@ params:
   ARTIFACTORY_URL:
   ARTIFACTORY_USERNAME:
   ARTIFACTORY_PASSWORD:
-  SONATYPE_USER:
+  SONATYPE_USERNAME:
   SONATYPE_PASSWORD:
   SONATYPE_URL:
   SONATYPE_STAGING_PROFILE_ID: