Skip to content

Commit 344aa40

Browse files
committed
Merge branch '2.5.x' into 2.6.x
Closes gh-30429
2 parents d1ec50b + 6e16552 commit 344aa40

File tree

1 file changed

+1
-3
lines changed
  • spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader

1 file changed

+1
-3
lines changed

spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import java.util.function.Supplier;
2424
import java.util.stream.Stream;
2525

26-
import org.junit.jupiter.api.condition.EnabledForJreRange;
27-
import org.junit.jupiter.api.condition.JRE;
2826
import org.junit.jupiter.params.ParameterizedTest;
2927
import org.junit.jupiter.params.provider.MethodSource;
3028
import org.testcontainers.containers.GenericContainer;
@@ -52,7 +50,6 @@ class LoaderIntegrationTests {
5250

5351
@ParameterizedTest
5452
@MethodSource("javaRuntimes")
55-
@EnabledForJreRange(max = JRE.JAVA_17)
5653
void readUrlsWithoutWarning(JavaRuntime javaRuntime) {
5754
try (GenericContainer<?> container = createContainer(javaRuntime)) {
5855
container.start();
@@ -81,6 +78,7 @@ static Stream<JavaRuntime> javaRuntimes() {
8178
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT));
8279
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
8380
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
81+
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHTEEN));
8482
javaRuntimes.add(JavaRuntime.oracleJdk17());
8583
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
8684
}

0 commit comments

Comments
 (0)