Skip to content

Commit e112657

Browse files
committed
Merge branch '2.7.x'
Closes gh-32261
2 parents 5352468 + 020e6dd commit e112657

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Arrays;
2222
import java.util.Collections;
2323
import java.util.List;
24+
import java.util.concurrent.Future;
2425

2526
import org.springframework.util.ClassUtils;
2627

@@ -41,7 +42,12 @@ public enum JavaVersion {
4142
/**
4243
* Java 18.
4344
*/
44-
EIGHTEEN("18", Duration.class, "isPositive");
45+
EIGHTEEN("18", Duration.class, "isPositive"),
46+
47+
/**
48+
* Java 19.
49+
*/
50+
NINETEEN("19", Future.class, "state");
4551

4652
private final String name;
4753

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.system;
1818

1919
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.condition.EnabledIf;
2021
import org.junit.jupiter.api.condition.EnabledOnJre;
2122
import org.junit.jupiter.api.condition.JRE;
2223

@@ -91,4 +92,14 @@ void currentJavaVersionEighteen() {
9192
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
9293
}
9394

95+
@Test
96+
@EnabledIf("java19")
97+
void currentJavaVersionNineteen() {
98+
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
99+
}
100+
101+
static boolean java19() {
102+
return "19".equals(System.getProperty("java.version"));
103+
}
104+
94105
}

0 commit comments

Comments
 (0)