Merge branch '3.2.x' into 3.3.x

Closes gh-42352

Author: wilkinsona

.github/actions/build/action.yml

@@ -13,6 +13,10 @@ inputs:
     required: false
     default: 'false'
     description: 'Whether a Java toolchain should be used'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The distribution of Java to use'
   publish:
     required: false
     default: 'false'
@@ -37,6 +41,7 @@ runs:
         java-version: ${{ inputs.java-version }}
         java-early-access: ${{ inputs.java-early-access }}
         java-toolchain: ${{ inputs.java-toolchain }}
+        java-distribution: ${{ inputs.java-distribution }}
     - name: Build
       id: build
       if: ${{ inputs.publish == 'false' }}

.github/actions/prepare-gradle-build/action.yml

@@ -8,11 +8,15 @@ inputs:
   java-early-access:
     required: false
     default: 'false'
-    description: 'Whether the Java version is in early access'
+    description: 'Whether the Java version is in early access. When true, forces java-distribution to temurin'
   java-toolchain:
     required: false
     default: 'false'
     description: 'Whether a Java toolchain should be used'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The distribution of Java to use'
   develocity-access-key:
     required: false
     description: 'The access key for authentication with ge.spring.io'
@@ -27,7 +31,7 @@ runs:
     - name: Set Up Java
       uses: actions/setup-java@v4
       with:
-        distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || 'liberica' }}
+        distribution: ${{ inputs.java-early-access == 'true' && 'temurin' || (inputs.java-distribution || 'liberica') }}
         java-version: |
           ${{ inputs.java-early-access == 'true' && format('{0}-ea', inputs.java-version) || inputs.java-version }}
           ${{ inputs.java-toolchain == 'true' && '17' || '' }}

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           - version: 22
             toolchain: true
           - version: 23
-            early-access: true
+            distribution: oracle
             toolchain: true
         exclude:
           - os:
@@ -49,6 +49,7 @@ jobs:
           java-version: ${{ matrix.java.version }}
           java-early-access: ${{ matrix.java.early-access || 'false' }}
           java-toolchain: ${{ matrix.java.toolchain }}
+          java-distribution: ${{ matrix.java.distribution }}
           develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       - name: Send Notification
         uses: ./.github/actions/send-notification