Merge branch '2.5.x' into 2.6.x

Author: philwebb

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

@@ -23,7 +23,6 @@
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import org.junit.Assume;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.testcontainers.containers.GenericContainer;
@@ -50,7 +49,6 @@ class LoaderIntegrationTests {
 	@ParameterizedTest
 	@MethodSource("javaRuntimes")
 	void readUrlsWithoutWarning(JavaRuntime javaRuntime) {
-		javaRuntime.assumeCompatible();
 		try (GenericContainer<?> container = createContainer(javaRuntime)) {
 			container.start();
 			System.out.println(this.output.toUtf8String());
@@ -79,7 +77,7 @@ static Stream<JavaRuntime> javaRuntimes() {
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
 		javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
 		javaRuntimes.add(JavaRuntime.oracleJdk17());
-		return javaRuntimes.stream();
+		return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
 	}
 
 	static final class JavaRuntime {
@@ -96,8 +94,8 @@ private JavaRuntime(String name, JavaVersion version, Supplier<GenericContainer<
 			this.container = container;
 		}
 
-		private void assumeCompatible() {
-			Assume.assumeTrue(JavaVersion.getJavaVersion().isEqualOrNewerThan(this.version));
+		private boolean isCompatible() {
+			return this.version.isEqualOrNewerThan(JavaVersion.getJavaVersion());
 		}
 
 		GenericContainer<?> getContainer() {