From f6f28938fe09df410ba6bcd2cd597ea15635ccd4 Mon Sep 17 00:00:00 2001 From: Dmytro Nosan Date: Thu, 2 Jan 2020 22:20:51 +0200 Subject: [PATCH] Add Java 14 to JavaVersion enumeration. --- .../org/springframework/boot/system/JavaVersion.java | 9 +++++++-- .../springframework/boot/system/JavaVersionTests.java | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) 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 7bce2652fc41..2b349bbfb96c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -16,6 +16,7 @@ package org.springframework.boot.system; +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -60,7 +61,11 @@ public enum JavaVersion { /** * Java 13. */ - THIRTEEN("13", String.class, "stripIndent"); + THIRTEEN("13", String.class, "stripIndent"), + /** + * Java 14. + */ + FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess"); 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 8c0498094de3..a2b03b429e25 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -115,4 +115,10 @@ void currentJavaVersionThirteen() { assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.THIRTEEN); } + @Test + @EnabledOnJre(JRE.JAVA_14) + void currentJavaVersionFourteen() { + assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FOURTEEN); + } + }