Browse Source

Merge branch '3.3.x'

Closes gh-41717
pull/41744/head
Stéphane Nicoll 2 years ago
parent
commit
f41991e020
  1. 9
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
  2. 6
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java

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

@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
package org.springframework.boot.system;
import java.io.Console;
import java.text.NumberFormat;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
@ -70,7 +71,13 @@ public enum JavaVersion { @@ -70,7 +71,13 @@ public enum JavaVersion {
* Java 22.
* @since 3.2.4
*/
TWENTY_TWO("22", Console.class, "isTerminal");
TWENTY_TWO("22", Console.class, "isTerminal"),
/**
* Java 23.
* @since 3.2.9
*/
TWENTY_THREE("23", NumberFormat .class, "isStrict");
private final String name;

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

@ -115,4 +115,10 @@ class JavaVersionTests { @@ -115,4 +115,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_TWO);
}
@Test
@EnabledOnJre(JRE.OTHER)
void currentJavaVersionTwentyThree() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_THREE);
}
}

Loading…
Cancel
Save