mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Use Bellsoft JDK 21 in LoaderIntegrationTests
Closes gh-35900
This commit is contained in:
parent
bd855135b0
commit
f96690348f
@ -85,9 +85,8 @@ class LoaderIntegrationTests {
|
|||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE));
|
||||||
javaRuntimes.add(JavaRuntime.oracleJdk17());
|
javaRuntimes.add(JavaRuntime.oracleJdk17());
|
||||||
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_ONE));
|
|
||||||
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
|
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,13 +117,6 @@ class LoaderIntegrationTests {
|
|||||||
return this.name;
|
return this.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
static JavaRuntime openJdkEarlyAccess(JavaVersion version) {
|
|
||||||
String imageVersion = version.toString();
|
|
||||||
DockerImageName image = DockerImageName.parse(String.format("openjdk:%s-ea-jdk", imageVersion));
|
|
||||||
return new JavaRuntime("OpenJDK Early Access " + imageVersion, version,
|
|
||||||
() -> new GenericContainer<>(image));
|
|
||||||
}
|
|
||||||
|
|
||||||
static JavaRuntime openJdk(JavaVersion version) {
|
static JavaRuntime openJdk(JavaVersion version) {
|
||||||
String imageVersion = (version != JavaVersion.EIGHT) ? version.toString() : "8";
|
String imageVersion = (version != JavaVersion.EIGHT) ? version.toString() : "8";
|
||||||
DockerImageName image = DockerImageName.parse("bellsoft/liberica-openjdk-debian:" + imageVersion);
|
DockerImageName image = DockerImageName.parse("bellsoft/liberica-openjdk-debian:" + imageVersion);
|
||||||
|
Loading…
Reference in New Issue
Block a user