Skip to content

Commit 8cb001d

Browse files
committed
Add CI for Java 25
Closes gh-46907
1 parent 21d4c9b commit 8cb001d

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ jobs:
2525
toolchain: false
2626
- version: 24
2727
toolchain: true
28+
- version: 25
29+
early-access: true
30+
toolchain: true
2831
exclude:
2932
- os:
3033
name: Linux

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ private GradleVersions() {
3333
}
3434

3535
public static List<String> allCompatible() {
36+
if (isJavaVersion(JavaVersion.VERSION_25)) {
37+
return Arrays.asList("9.0.0", "9.1.0-rc-1");
38+
}
3639
if (isJavaVersion(JavaVersion.VERSION_24)) {
3740
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
3841
}

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/java/org/springframework/boot/maven/JarIntegrationTests.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.util.jar.JarFile;
2727

2828
import org.junit.jupiter.api.TestTemplate;
29+
import org.junit.jupiter.api.condition.DisabledForJreRange;
30+
import org.junit.jupiter.api.condition.JRE;
2931
import org.junit.jupiter.api.extension.ExtendWith;
3032

3133
import org.springframework.boot.loader.tools.JarModeLibrary;
@@ -323,6 +325,8 @@ void whenADependencyHasTestScopeItIsNotIncludedInTheRepackagedJar(MavenBuild mav
323325
}
324326

325327
@TestTemplate
328+
@DisabledForJreRange(min = JRE.JAVA_25) // Kotlin Maven integration does not support
329+
// Java 25
326330
void whenAProjectUsesKotlinItsModuleMetadataIsRepackagedIntoBootInfClasses(MavenBuild mavenBuild) {
327331
mavenBuild.project("jar-with-kotlin-module").execute((project) -> {
328332
File main = new File(project, "target/jar-with-kotlin-module-0.0.1.BUILD-SNAPSHOT.jar");

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/StaticResourceJarsTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import java.util.jar.JarOutputStream;
3030

3131
import org.junit.jupiter.api.Test;
32+
import org.junit.jupiter.api.condition.DisabledForJreRange;
33+
import org.junit.jupiter.api.condition.JRE;
3234
import org.junit.jupiter.api.io.TempDir;
3335

3436
import static org.assertj.core.api.Assertions.assertThat;
@@ -75,6 +77,7 @@ void excludeJarWithoutStaticResources() throws Exception {
7577
}
7678

7779
@Test
80+
@DisabledForJreRange(min = JRE.JAVA_25) // Requires -Djdk.net.file.ftpfallback=true
7881
void uncPathsAreTolerated() throws Exception {
7982
File jarFile = createResourcesJar("test-resources.jar");
8083
List<URL> staticResourceJarUrls = new StaticResourceJars().getUrlsFrom(jarFile.toURI().toURL(),

0 commit comments

Comments
 (0)