mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.7.x' into 3.0.x
Closes gh-37521
This commit is contained in:
commit
58941d85f2
@ -83,9 +83,8 @@ class LoaderIntegrationTests {
|
|||||||
static Stream<JavaRuntime> javaRuntimes() {
|
static Stream<JavaRuntime> javaRuntimes() {
|
||||||
List<JavaRuntime> javaRuntimes = new ArrayList<>();
|
List<JavaRuntime> javaRuntimes = new ArrayList<>();
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,13 +115,6 @@ class LoaderIntegrationTests {
|
|||||||
return this.name;
|
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) {
|
static JavaRuntime openJdk(JavaVersion version) {
|
||||||
String imageVersion = version.toString();
|
String imageVersion = version.toString();
|
||||||
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