Browse Source

Merge branch '2.7.x'

Closes gh-32261
pull/32224/head
Andy Wilkinson 3 years ago
parent
commit
e112657e1a
  1. 8
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
  2. 11
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java

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

@ -21,6 +21,7 @@ import java.time.Duration; @@ -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 { @@ -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

@ -17,6 +17,7 @@ @@ -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 { @@ -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"));
}
}

Loading…
Cancel
Save