From c4368bc934ab999bb7206fffd69007ef19adf483 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 13 Sep 2023 13:36:04 +0100 Subject: [PATCH] Run LoaderIntegrationTests on Java 21 See gh-37359 --- .../boot/loader/LoaderIntegrationTests.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 f76e35090cc..e81afb70ed8 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 @@ -87,6 +87,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); } @@ -117,6 +118,13 @@ 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);