root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x 

Closes gh-37364
This commit is contained in:
Andy Wilkinson 2023-09-13 11:15:33 +01:00
parent 28ea983860 eba2f718a7
commit b9c223581e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import java.time.Duration;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.SortedSet;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -57,7 +58,13 @@ public enum JavaVersion {
* Java 20. * Java 20.
* @since 2.7.13 * @since 2.7.13
*/ */
TWENTY("20", Class.class, "accessFlags"); TWENTY("20", Class.class, "accessFlags"),
/**
* Java 21.
* @since 2.7.16
*/
TWENTY_ONE("21", SortedSet.class, "getFirst");
private final String name; private final String name;

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

@ -103,4 +103,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY); assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY);
} }
@Test
@EnabledOnJre(JRE.JAVA_21)
void currentJavaVersionTwentyOne() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_ONE);
}
} }