From f96690348f32529545f6f1244a482b1e086d5412 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 22 Sep 2023 08:35:22 +0200 Subject: [PATCH] Use Bellsoft JDK 21 in LoaderIntegrationTests Closes gh-35900 --- .../boot/loader/LoaderIntegrationTests.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index e81afb70ed8..0bfea390679 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -85,9 +85,8 @@ class LoaderIntegrationTests { javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN)); 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); } @@ -118,13 +117,6 @@ class LoaderIntegrationTests { 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) { String imageVersion = (version != JavaVersion.EIGHT) ? version.toString() : "8"; DockerImageName image = DockerImageName.parse("bellsoft/liberica-openjdk-debian:" + imageVersion);