Merge branch '2.2.x' into 2.3.x

Closes gh-24420

ci/pipeline.yml

@@ -578,11 +578,28 @@ jobs:
       name: generated-changelog/tag
       tag: generated-changelog/tag
       body: generated-changelog/changelog.md
+- name: publish-to-sdkman
+  serial: true
+  plan:
+    - get: ci-image
+    - get: git-repo
+    - get: artifactory-repo
+      passed: [sync-to-maven-central]
+      params:
+        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
+        RELEASE_TYPE: RELEASE
+        BRANCH: ((branch))
 groups:
 - name: "builds"
   jobs: ["build", "jdk11-build", "jdk15-build", "windows-build"]
 - name: "releases"
-  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
+  jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central", "publish-to-sdkman"]
 - name: "ci-images"
   jobs: ["build-ci-images", "detect-docker-updates", "detect-jdk-updates", "detect-ubuntu-image-updates"]
 - name: "pull-requests"

ci/scripts/promote.sh

@@ -11,7 +11,5 @@ java -jar /spring-boot-release-scripts.jar distribute $RELEASE_TYPE $BUILD_INFO_
 
 java -jar /spring-boot-release-scripts.jar publishGradlePlugin $RELEASE_TYPE $BUILD_INFO_LOCATION || { exit 1; }
 
-java -jar /spring-boot-release-scripts.jar publishToSdkman $RELEASE_TYPE $version $BRANCH || {exit 1;}
-
 echo "Promotion complete"
 echo $version > version/version

ci/scripts/publish-to-sdkman.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source $(dirname $0)/common.sh
+
+version=$( cat artifactory-repo/build-info.json | jq -r '.buildInfo.modules[0].id' | sed 's/.*:.*:\(.*\)/\1/' )
+
+java -jar /spring-boot-release-scripts.jar publishToSdkman $RELEASE_TYPE $version $BRANCH || {exit 1;}
+
+echo "Push to SDKMAN complete"

ci/tasks/publish-to-sdkman.yml

@@ -0,0 +1,11 @@
+---
+platform: linux
+inputs:
+  - name: artifactory-repo
+params:
+  RELEASE_TYPE:
+  BRANCH:
+  SDKMAN_CONSUMER_KEY:
+  SDKMAN_CONSUMER_TOKEN:
+run:
+  path: git-repo/ci/scripts/publish-to-sdkman.sh