Merge branch '3.0.x' into 3.1.x

3.1.x
Andy Wilkinson 1 year ago
commit dc9a48030c

@ -85,6 +85,7 @@ class LoaderIntegrationTests {
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY));
javaRuntimes.add(JavaRuntime.oracleJdk17());
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_ONE));
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
}
@ -115,6 +116,13 @@ 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…
Cancel
Save