mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-05 00:56:58 +08:00
Merge branch '3.1.x'
Closes gh-37523
This commit is contained in:
commit
a7373c182a
|
@ -84,9 +84,8 @@ class LoaderIntegrationTests {
|
|||
static Stream<JavaRuntime> javaRuntimes() {
|
||||
List<JavaRuntime> javaRuntimes = new ArrayList<>();
|
||||
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.openJdkEarlyAccess(JavaVersion.TWENTY_ONE));
|
||||
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
|
||||
}
|
||||
|
||||
|
@ -117,13 +116,6 @@ class LoaderIntegrationTests {
|
|||
return this.name;
|
||||
}
|
||||
|
||||
static JavaRuntime openJdkEarlyAccess(JavaVersion version) {
|
||||
String imageVersion = version.toString();
|
||||
DockerImageName image = DockerImageName.parse("openjdk:%s-ea-jdk".formatted(imageVersion));
|
||||
return new JavaRuntime("OpenJDK Early Access " + imageVersion, version,
|
||||
() -> new GenericContainer<>(image));
|
||||
}
|
||||
|
||||
static JavaRuntime openJdk(JavaVersion version) {
|
||||
String imageVersion = version.toString();
|
||||
DockerImageName image = DockerImageName.parse("bellsoft/liberica-openjdk-debian:" + imageVersion);
|
||||
|
|
Loading…
Reference in New Issue
Block a user