spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51428
This commit is contained in:
Andy Wilkinson
2026-08-24 15:24:59 +01:00
parent feb66aa843 ee059ae3ca
commit ec28f8b530
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+3
View File
@@ -27,6 +27,9 @@ jobs:
toolchain: false
- version: 26
toolchain: true
- version: 27
toolchain: true
early-access: true
exclude:
- os:
name: Linux
integration-test/spring-boot-loader-integration-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
+2 -1
View File
@@ -154,7 +154,8 @@ class LoaderIntegrationTests {
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_THREE));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FOUR));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_FIVE));
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_SIX));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_SIX));
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_SEVEN));
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
}
test-support/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
+3
View File
@@ -33,6 +33,9 @@ public final class GradleVersions {
}
public static List<String> allCompatible() {
if (isJavaVersion(JavaVersion.VERSION_27)) {
return Arrays.asList("9.8.0-20260824065828+0000");
}
if (isJavaVersion(JavaVersion.VERSION_26)) {
return Arrays.asList("9.4.0", GradleVersion.current().getVersion());
}