Merge branch '3.3.x'

Closes gh-41459

.github/actions/build/action.yml

@@ -5,13 +5,17 @@ inputs:
     required: false
     default: '17'
     description: 'The Java version to compile and test with'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The Java distribution to use for the build'
   java-toolchain:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether a Java toolchain should be used'
   publish:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
   develocity-access-key:
     required: false
@@ -31,6 +35,7 @@ runs:
       with:
         develocity-access-key: ${{ inputs.develocity-access-key }}
         java-version: ${{ inputs.java-version }}
+        java-distribution: ${{ inputs.java-distribution }}
         java-toolchain: ${{ inputs.java-toolchain }}
     - name: Build
       id: build

.github/workflows/ci.yml

@@ -43,6 +43,7 @@ jobs:
         uses: ./.github/actions/build
         with:
           java-version: ${{ matrix.java.version }}
+          java-distribution: ${{ matrix.java.distribution || 'liberica' }}
           java-toolchain: ${{ matrix.java.toolchain }}
           develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       - name: Send Notification

.github/workflows/release.yml

@@ -7,9 +7,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   build-and-stage-release:
-    if: ${{ github.repository == 'spring-projects/spring-boot' }}
     name: Build and Stage Release
     runs-on: ubuntu-latest
+    if: ${{ github.repository == 'spring-projects/spring-boot' }}
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4
@@ -22,14 +22,14 @@ jobs:
       - name: Stage Release
         uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
         with:
-          build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
-          folder: 'deployment-repository'
+          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'
+          folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
           signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          uri: 'https://repo.spring.io'
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
     outputs:
       version: ${{ steps.build-and-publish.outputs.version }}
   verify:

.github/workflows/trigger-docs-build.yml

@@ -16,8 +16,8 @@ permissions:
 jobs:
   trigger-docs-build:
     name: Trigger Docs Build
-    if: github.repository_owner == 'spring-projects'
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'spring-projects'
     steps:
     - name: Check Out
       uses: actions/checkout@v4