From 68ce174980d0022bad3532a9f8872f2272bb9b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 13 Aug 2024 10:18:37 +0200 Subject: [PATCH] Adapt LoaderIntegrationTests to Java 23 See gh-41698 --- .../springframework/boot/loader/LoaderIntegrationTests.java | 3 ++- .../springframework/boot/loader/LoaderIntegrationTests.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index f6f3a259a65..bdf820c1b81 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-classic-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -82,7 +82,8 @@ class LoaderIntegrationTests { javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE)); javaRuntimes.add(JavaRuntime.oracleJdk17()); - javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO)); + javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO)); + javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE)); return javaRuntimes.stream().filter(JavaRuntime::isCompatible); } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index 82d386566c4..be3b85fd394 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/dockerTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -110,7 +110,8 @@ class LoaderIntegrationTests { javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN)); javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_ONE)); javaRuntimes.add(JavaRuntime.oracleJdk17()); - javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_TWO)); + javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY_TWO)); + javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_THREE)); return javaRuntimes.stream().filter(JavaRuntime::isCompatible); }