Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-45694
This commit is contained in:
Andy Wilkinson
2025-05-27 10:56:51 +01:00
parent f799fc4777 2efad20f7b
commit 5f591b376f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
View File

@@ -154,7 +154,3 @@ plugins.withType(EclipsePlugin) {
}
}
}
toolchain {
maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
}

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
View File

@@ -33,9 +33,12 @@ public final class GradleVersions {
}
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_23)) {
if (isJavaVersion(JavaVersion.VERSION_24)) {
return Arrays.asList(GradleVersion.current().getVersion());
}
if (isJavaVersion(JavaVersion.VERSION_23)) {
return Arrays.asList("8.10", GradleVersion.current().getVersion());
}
if (isJavaVersion(JavaVersion.VERSION_22)) {
return Arrays.asList("8.8", GradleVersion.current().getVersion());
}