From e9c433a0b781c0b4d9c91d035067fa2c48068a6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Thu, 24 Mar 2022 15:52:43 -0600 Subject: [PATCH 1/2] Enable Java 18 for LoaderIntegrationTests See gh-30422 --- .../org/springframework/boot/loader/LoaderIntegrationTests.java | 1 + 1 file changed, 1 insertion(+) 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 5162ea39677..bc2a0d950cb 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 @@ -81,6 +81,7 @@ 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.EIGHTEEN)); javaRuntimes.add(JavaRuntime.oracleJdk17()); return javaRuntimes.stream().filter(JavaRuntime::isCompatible); } From e36ac6c155d0ec40bc57d8696bf616410a778dfc Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 25 Mar 2022 11:02:09 +0000 Subject: [PATCH 2/2] Polish "Enable Java 18 for LoaderIntegrationTests" See gh-30422 --- .../springframework/boot/loader/LoaderIntegrationTests.java | 3 --- 1 file changed, 3 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 bc2a0d950cb..8aa27b2efdc 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 @@ -23,8 +23,6 @@ import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.testcontainers.containers.GenericContainer; @@ -52,7 +50,6 @@ class LoaderIntegrationTests { @ParameterizedTest @MethodSource("javaRuntimes") - @EnabledForJreRange(max = JRE.JAVA_17) void readUrlsWithoutWarning(JavaRuntime javaRuntime) { try (GenericContainer container = createContainer(javaRuntime)) { container.start();