Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-32261
This commit is contained in:
Andy Wilkinson 2022-09-08 15:30:01 +01:00
commit e112657e1a
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.Collections;
import java.util.List;
import java.util.concurrent.Future;
import org.springframework.util.ClassUtils;
@ -41,7 +42,12 @@ public enum JavaVersion {
/**
* Java 18.
*/
EIGHTEEN("18", Duration.class, "isPositive");
EIGHTEEN("18", Duration.class, "isPositive"),
/**
* Java 19.
*/
NINETEEN("19", Future.class, "state");
private final String name;

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

@ -17,6 +17,7 @@
package org.springframework.boot.system;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
@ -91,4 +92,14 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
}
@Test
@EnabledIf("java19")
void currentJavaVersionNineteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
}
static boolean java19() {
return "19".equals(System.getProperty("java.version"));
}
}