Skip to content

Commit 13a3e3b

Browse files
mhalbritterwilkinsona
authored andcommitted
Add TWENTY_ONE to JavaVersion
Closes gh-37362
1 parent 75233e9 commit 13a3e3b

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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collections;
2424
import java.util.List;
2525
import java.util.Optional;
26+
import java.util.SortedSet;
2627
import java.util.concurrent.Future;
2728
import java.util.stream.Stream;
2829

@@ -114,7 +115,13 @@ public enum JavaVersion {
114115
* Java 20.
115116
* @since 2.7.13
116117
*/
117-
TWENTY("20", Class.class, "accessFlags");
118+
TWENTY("20", Class.class, "accessFlags"),
119+
120+
/**
121+
* Java 21.
122+
* @since 2.7.16
123+
*/
124+
TWENTY_ONE("21", SortedSet.class, "getFirst");
118125

119126
private final String name;
120127

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ void currentJavaVersionTwenty() {
158158
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY);
159159
}
160160

161+
@Test
162+
@EnabledIf("java21")
163+
void currentJavaVersionTwentyOne() {
164+
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_ONE);
165+
}
166+
161167
static boolean java19() {
162168
return "19".equals(System.getProperty("java.version"));
163169
}
@@ -166,4 +172,8 @@ static boolean java20() {
166172
return System.getProperty("java.version").startsWith("20");
167173
}
168174

175+
static boolean java21() {
176+
return System.getProperty("java.version").startsWith("21");
177+
}
178+
169179
}

0 commit comments

Comments
 (0)