Skip to content

Commit 3eb8934

Browse files
committed
Merge branch '2.7.x' into 3.0.x
2 parents 4c14336 + c4368bc commit 3eb8934

File tree

1 file changed

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

1 file changed

+8
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ static Stream<JavaRuntime> javaRuntimes() {
8585
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
8686
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY));
8787
javaRuntimes.add(JavaRuntime.oracleJdk17());
88+
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_ONE));
8889
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
8990
}
9091

@@ -115,6 +116,13 @@ public String toString() {
115116
return this.name;
116117
}
117118

119+
static JavaRuntime openJdkEarlyAccess(JavaVersion version) {
120+
String imageVersion = version.toString();
121+
DockerImageName image = DockerImageName.parse("openjdk:%s-ea-jdk".formatted(imageVersion));
122+
return new JavaRuntime("OpenJDK Early Access " + imageVersion, version,
123+
() -> new GenericContainer<>(image));
124+
}
125+
118126
static JavaRuntime openJdk(JavaVersion version) {
119127
String imageVersion = version.toString();
120128
DockerImageName image = DockerImageName.parse("bellsoft/liberica-openjdk-debian:" + imageVersion);

0 commit comments

Comments
 (0)