|
|
|
|
@ -83,9 +83,8 @@ class LoaderIntegrationTests {
@@ -83,9 +83,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); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@ -116,13 +115,6 @@ class LoaderIntegrationTests {
@@ -116,13 +115,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); |
|
|
|
|
|