From 85a6686cae41c0f6ce1383312f6529e8c6cfc36a Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Thu, 4 Jun 2020 07:26:04 +0200 Subject: [PATCH] Add Java 15 to JavaVersion enum See gh-21691 --- .../java/org/springframework/boot/system/JavaVersion.java | 7 ++++++- .../org/springframework/boot/system/JavaVersionTests.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java index e6fcb3ed01..18a0d358c5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java @@ -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; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java index a2b03b429e..539ad9b410 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java @@ -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); + } + }