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

Merge branch '2.5.x' into 2.6.x 

Closes gh-30132
This commit is contained in:
Andy Wilkinson 2022-03-09 14:26:48 +00:00
parent b0e4cabdd8 314acd3407
commit b1be6ac271
2 changed files with 15 additions and 3 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-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -18,6 +18,7 @@ package org.springframework.boot.system;
import java.io.Console;
import java.lang.invoke.MethodHandles;
import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -83,7 +84,12 @@ public enum JavaVersion {
/**
* Java 17.
*/
SEVENTEEN("17", Console.class, "charset");
SEVENTEEN("17", Console.class, "charset"),
/**
* Java 18.
*/
EIGHTEEN("18", Duration.class, "isPositive");
private final String name;

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 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.
@ -139,4 +139,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SEVENTEEN);
}
@Test
@EnabledOnJre(JRE.JAVA_18)
void currentJavaVersionEighteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
}
}