root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.7.x' 

Closes gh-32512
This commit is contained in:
Stephane Nicoll 2022-09-27 08:30:44 +02:00
parent f6f545dbf1 9a004a6508
commit 72fc1f0018
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
@ -46,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
*/
@DisabledIfDockerUnavailable
@EnabledForJreRange(max = JRE.JAVA_18)
class LoaderIntegrationTests {
private final ToStringConsumer output = new ToStringConsumer();
@ -79,7 +76,7 @@ class LoaderIntegrationTests {
static Stream<JavaRuntime> javaRuntimes() {
List<JavaRuntime> javaRuntimes = new ArrayList<>();
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHTEEN));
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.NINETEEN));
javaRuntimes.add(JavaRuntime.oracleJdk17());
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
}