Skip to content

Commit 7b7e68a

Browse files
committed
Merge pull request #21691 from dreis2211
* gh-21691: Add Java 15 to JavaVersion enum Closes gh-21691
2 parents 8fb7a6c + 85a6686 commit 7b7e68a

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ public enum JavaVersion {
6666
/**
6767
* Java 14.
6868
*/
69-
FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess");
69+
FOURTEEN("14", MethodHandles.Lookup.class, "hasFullPrivilegeAccess"),
70+
71+
/**
72+
* Java 15.
73+
*/
74+
FIFTEEN("15", CharSequence.class, "isEmpty");
7075

7176
private final String name;
7277

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,10 @@ void currentJavaVersionFourteen() {
121121
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FOURTEEN);
122122
}
123123

124+
@Test
125+
@EnabledOnJre(JRE.JAVA_15)
126+
void currentJavaVersionFifteen() {
127+
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN);
128+
}
129+
124130
}

0 commit comments

Comments
 (0)