Skip to content

Commit 5f591b3

Browse files
committed
Merge branch '3.4.x'
Closes gh-45694
2 parents f799fc4 + 2efad20 commit 5f591b3

File tree

2 files changed

+4
-5
lines changed
  • spring-boot-project/spring-boot-tools

2 files changed

+4
-5
lines changed

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,3 @@ plugins.withType(EclipsePlugin) {
154154
}
155155
}
156156
}
157-
158-
toolchain {
159-
maximumCompatibleJavaVersion = JavaLanguageVersion.of(23)
160-
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ private GradleVersions() {
3333
}
3434

3535
public static List<String> allCompatible() {
36-
if (isJavaVersion(JavaVersion.VERSION_23)) {
36+
if (isJavaVersion(JavaVersion.VERSION_24)) {
3737
return Arrays.asList(GradleVersion.current().getVersion());
3838
}
39+
if (isJavaVersion(JavaVersion.VERSION_23)) {
40+
return Arrays.asList("8.10", GradleVersion.current().getVersion());
41+
}
3942
if (isJavaVersion(JavaVersion.VERSION_22)) {
4043
return Arrays.asList("8.8", GradleVersion.current().getVersion());
4144
}

0 commit comments

Comments
 (0)