root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.5.x' 

Closes gh-47413
This commit is contained in:
Andy Wilkinson 2025-10-06 18:44:02 +01:00
parent 44099d3d21 a79d0e0d10
commit 473fc1b19e
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/actions/prepare-gradle-build/action.yml vendored
View File

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

6
.github/workflows/ci.yml vendored
View File

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

2
.sdkmanrc
View File

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