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

Merge pull request #26769 from dreis2211 

* gh-26769:
  Add Java 17 to JavaVersion enum

Closes gh-26769
This commit is contained in:
Andy Wilkinson 2021-07-20 15:13:30 +01:00
parent 6036cde7a3 0ea3b9246a
commit c2819d6c50
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-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -16,6 +16,7 @@
package org.springframework.boot.system; package org.springframework.boot.system;
import java.io.Console;
import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -77,7 +78,12 @@ public enum JavaVersion {
/** /**
* Java 16. * Java 16.
*/ */
SIXTEEN("16", Stream.class, "toList"); SIXTEEN("16", Stream.class, "toList"),
/**
* Java 17.
*/
SEVENTEEN("17", Console.class, "charset");
private final String name; 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-2020 the original author or authors. * Copyright 2012-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -133,4 +133,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN); assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN);
} }
@Test
@EnabledOnJre(JRE.JAVA_17)
void currentJavaVersionSeventeen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SEVENTEEN);
}
} }