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

Merge branch '2.4.x' 

Closes gh-24581
This commit is contained in:
Stephane Nicoll 2020-12-21 10:03:31 +01:00
parent e7004dbc6f cd9e8a8592
commit c063c3434d
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/TestJarCreator.java
View File

@ -98,6 +98,7 @@ public abstract class TestJarCreator {
writeEntry(jarOutputStream, "META-INF/versions/13/multi-release.dat", 13);
writeEntry(jarOutputStream, "META-INF/versions/14/multi-release.dat", 14);
writeEntry(jarOutputStream, "META-INF/versions/15/multi-release.dat", 15);
writeEntry(jarOutputStream, "META-INF/versions/16/multi-release.dat", 16);
}
else {
writeEntry(jarOutputStream, "3.dat", 3);

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

@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import org.springframework.util.ClassUtils;
@ -71,7 +72,12 @@ public enum JavaVersion {
/**
* Java 15.
*/
FIFTEEN("15", CharSequence.class, "isEmpty");
FIFTEEN("15", CharSequence.class, "isEmpty"),
/**
* Java 16.
*/
SIXTEEN("16", Stream.class, "toList");
private final String name;

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

@ -127,4 +127,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN);
}
@Test
@EnabledOnJre(JRE.JAVA_16)
void currentJavaVersionSixteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN);
}
}