Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-35763
This commit is contained in:
Moritz Halbritter 2023-06-07 08:27:19 +02:00
commit 9149fc3e77
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2022 the original author or authors.
* Copyright 2012-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -30,6 +30,7 @@ import org.springframework.util.ClassUtils;
*
* @author Oliver Gierke
* @author Phillip Webb
* @author Moritz Halbritter
* @since 2.0.0
*/
public enum JavaVersion {
@ -47,7 +48,12 @@ public enum JavaVersion {
/**
* Java 19.
*/
NINETEEN("19", Future.class, "state");
NINETEEN("19", Future.class, "state"),
/**
* Java 20.
*/
TWENTY("20", Class.class, "accessFlags");
private final String name;

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

@ -97,4 +97,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
}
@Test
@EnabledOnJre(JRE.JAVA_20)
void currentJavaVersionTwenty() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY);
}
}