Merge branch '3.2.x' into 3.3.x

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
   build-and-stage-release:
     name: Build and Stage Release
     runs-on: ${{ vars.UBUNTU_MEDIUIM || 'ubuntu-latest' }}
-    if: ${{ github.repository == 'spring-projects/spring-boot' }}
+    if: ${{ github.repository == 'spring-projects/spring-boot' || github.repository == 'spring-projects/spring-boot-commercial' }}
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4
@@ -26,11 +26,12 @@ jobs:
       - name: Stage Release
         uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
         with:
-          uri: 'https://repo.spring.io'
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
-          password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
-          repository: 'libs-staging-local'
+          uri: ${{ vars.COMMERCIAL_DEPLOY_REPO_URL || 'https://repo.spring.io' }}
+          username: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_USERNAME || secrets.ARTIFACTORY_USERNAME }}
+          password: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_ARTIFACTORY_PASSWORD || secrets.ARTIFACTORY_PASSWORD }}
+          build-name: ${{ vars.COMMERCIAL && format('spring-boot-commercial-{0}', github.ref_name) || format('spring-boot-{0}', github.ref_name) }}
+          repository: ${{ vars.COMMERCIAL && 'spring-enterprise-maven-stage-local' || 'libs-staging-local' }}
+          project: ${{ vars.COMMERCIAL && 'spring' }}
           folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
           signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -50,6 +51,7 @@ jobs:
       token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
   sync-to-maven-central:
     name: Sync to Maven Central
+    if: ${{ !COMMERCIAL }}
     needs:
       - build-and-stage-release
       - verify
@@ -75,11 +77,16 @@ jobs:
       - name: Set up JFrog CLI
         uses: jfrog/setup-jfrog-cli@9fe0f98bd45b19e6e931d457f4e98f8f84461fb5 # v4.4.1
         env:
-          JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
-      - name: Promote build
+          JF_ENV_SPRING: ${{ vars.COMMERCIAL && secrets.COMMERCIAL_JF_ARTIFACTORY_SPRING || secrets.JF_ARTIFACTORY_SPRING }}
+      - name: Promote open source build
+        if: ${{ !vars.COMMERCIAL }}
         run: jfrog rt build-promote ${{ format('spring-boot-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} libs-release-local
+      - name: Promote commercial build
+        if: ${{ vars.COMMERCIAL }}
+        run: jfrog rt build-promote ${{ format('spring-boot-commercial-{0}', needs.build-and-stage-release.outputs.version)}} ${{ github.run_number }} spring-enterprise-maven-prod-local --project spring
   publish-gradle-plugin:
     name: Publish Gradle Plugin
+    if: ${{ !COMMERCIAL }}
     needs:
       - build-and-stage-release
       - sync-to-maven-central
@@ -96,6 +103,7 @@ jobs:
           plugin-version: ${{ needs.build-and-stage-release.outputs.version }}
   publish-to-sdkman:
     name: Publish to SDKMAN!
+    if: ${{ !COMMERCIAL }}
     needs:
       - build-and-stage-release
       - sync-to-maven-central