mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-30 22:39:06 +00:00
Add CI for Java 25
Closes gh-46907
This commit is contained in:
@@ -25,6 +25,9 @@ jobs:
|
||||
toolchain: false
|
||||
- version: 24
|
||||
toolchain: true
|
||||
- version: 25
|
||||
early-access: true
|
||||
toolchain: true
|
||||
exclude:
|
||||
- os:
|
||||
name: Linux
|
||||
|
||||
+3
@@ -33,6 +33,9 @@ public final class GradleVersions {
|
||||
}
|
||||
|
||||
public static List<String> allCompatible() {
|
||||
if (isJavaVersion(JavaVersion.VERSION_25)) {
|
||||
return Arrays.asList("9.0.0", "9.1.0-rc-1");
|
||||
}
|
||||
if (isJavaVersion(JavaVersion.VERSION_24)) {
|
||||
return Arrays.asList(GradleVersion.current().getVersion(), "9.0.0", "9.1.0-rc-1");
|
||||
}
|
||||
|
||||
+4
@@ -26,6 +26,8 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
import java.util.jar.JarFile;
|
||||
|
||||
import org.junit.jupiter.api.TestTemplate;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
import org.junit.jupiter.api.condition.JRE;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
|
||||
import org.springframework.boot.loader.tools.JarModeLibrary;
|
||||
@@ -323,6 +325,8 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
@DisabledForJreRange(min = JRE.JAVA_25) // Kotlin Maven integration does not support
|
||||
// Java 25
|
||||
void whenAProjectUsesKotlinItsModuleMetadataIsRepackagedIntoBootInfClasses(MavenBuild mavenBuild) {
|
||||
mavenBuild.project("jar-with-kotlin-module").execute((project) -> {
|
||||
File main = new File(project, "target/jar-with-kotlin-module-0.0.1.BUILD-SNAPSHOT.jar");
|
||||
|
||||
+3
@@ -29,6 +29,8 @@ import java.util.jar.JarEntry;
|
||||
import java.util.jar.JarOutputStream;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.condition.DisabledForJreRange;
|
||||
import org.junit.jupiter.api.condition.JRE;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
@@ -75,6 +77,7 @@ class StaticResourceJarsTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisabledForJreRange(min = JRE.JAVA_25) // Requires -Djdk.net.file.ftpfallback=true
|
||||
void uncPathsAreTolerated() throws Exception {
|
||||
File jarFile = createResourcesJar("test-resources.jar");
|
||||
List<URL> staticResourceJarUrls = new StaticResourceJars().getUrlsFrom(jarFile.toURI().toURL(),
|
||||
|
||||
Reference in New Issue
Block a user