Skip to content

Commit 23979e6

Browse files
committed
Enable LoaderIntegrationTests on Java 21
1 parent 3e4a9f5 commit 23979e6

File tree

1 file changed

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

1 file changed

+9
-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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
* Integration tests loader that supports fat jars.
4545
*
4646
* @author Phillip Webb
47+
* @author Moritz Halbritter
4748
*/
4849
@DisabledIfDockerUnavailable
4950
@DisabledOnOs(os = { OS.LINUX, OS.MAC }, architecture = "aarch64",
@@ -85,6 +86,7 @@ static Stream<JavaRuntime> javaRuntimes() {
8586
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.SEVENTEEN));
8687
javaRuntimes.add(JavaRuntime.openJdk(JavaVersion.TWENTY));
8788
javaRuntimes.add(JavaRuntime.oracleJdk17());
89+
javaRuntimes.add(JavaRuntime.openJdkEarlyAccess(JavaVersion.TWENTY_ONE));
8890
return javaRuntimes.stream().filter(JavaRuntime::isCompatible);
8991
}
9092

@@ -115,6 +117,13 @@ public String toString() {
115117
return this.name;
116118
}
117119

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

0 commit comments

Comments
 (0)