Merge branch '3.5.x'

Closes gh-47413
This commit is contained in:
Andy Wilkinson 2025-10-06 18:44:02 +01:00
commit 473fc1b19e
3 changed files with 4 additions and 6 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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