mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-32511
This commit is contained in:
commit
9a004a6508
@ -23,8 +23,6 @@ import java.util.List;
|
|||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Stream;
|
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.ParameterizedTest;
|
||||||
import org.junit.jupiter.params.provider.MethodSource;
|
import org.junit.jupiter.params.provider.MethodSource;
|
||||||
import org.testcontainers.containers.GenericContainer;
|
import org.testcontainers.containers.GenericContainer;
|
||||||
@ -46,7 +44,6 @@ import static org.assertj.core.api.Assertions.assertThat;
|
|||||||
* @author Phillip Webb
|
* @author Phillip Webb
|
||||||
*/
|
*/
|
||||||
@DisabledIfDockerUnavailable
|
@DisabledIfDockerUnavailable
|
||||||
@EnabledForJreRange(max = JRE.JAVA_18)
|
|
||||||
class LoaderIntegrationTests {
|
class LoaderIntegrationTests {
|
||||||
|
|
||||||
private final ToStringConsumer output = new ToStringConsumer();
|
private final ToStringConsumer output = new ToStringConsumer();
|
||||||
@ -81,7 +78,7 @@ class LoaderIntegrationTests {
|
|||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHT));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.ELEVEN));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
|
||||||
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.EIGHTEEN));
|
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.NINETEEN));
|
||||||
javaRuntimes.add(JavaRuntime.oracleJdk17());
|
javaRuntimes.add(JavaRuntime.oracleJdk17());
|
||||||
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
|
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user