Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21691 from dreis2211

Browse Source 
* gh-21691:
  Add Java 15 to JavaVersion enum

Closes gh-21691
This commit is contained in:
Andy Wilkinson
2020-06-05 14:09:08 +01:00
parent 8fb7a6cace 85a6686cae
commit 7b7e68a9aa
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,12 @@ public enum JavaVersion {
/**
* Java 14.
*/
FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess");
FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess"),
/**
* Java 15.
*/
FIFTEEN("15", CharSequence.class, "isEmpty");
private final String name;

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

@@ -121,4 +121,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FOURTEEN);
}
@Test
@EnabledOnJre(JRE.JAVA_15)
void currentJavaVersionFifteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN);
}
}