Merge branch '3.5.x'

Closes gh-47413

Author: wilkinsona

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

@@ -23,7 +23,7 @@ inputs:
   java-version:
     description: 'Java version to use for the build'
     required: false
-    default: '24'
+    default: '25'
 runs:
   using: composite
   steps:

.github/workflows/ci.yml

@@ -23,15 +23,13 @@ jobs:
             toolchain: true
           - version: 21
             toolchain: true
-          - version: 24
-            toolchain: false
           - version: 25
-            toolchain: true
+            toolchain: false
         exclude:
           - os:
               name: Linux
             java:
-              version: 24
+              version: 25
           - os:
               name: ${{ github.repository == 'spring-projects/spring-boot-commercial' && 'Windows' }}
     steps:

.sdkmanrc

@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=24.0.2-librca
+java=25-librca