Skip to content

Commit c063c34

Browse files
committed
Merge branch '2.4.x'
Closes gh-24581
2 parents e7004db + cd9e8a8 commit c063c34

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ private static byte[] getNestedJarData(boolean multiRelease) throws Exception {
9898
writeEntry(jarOutputStream, "META-INF/versions/13/multi-release.dat", 13);
9999
writeEntry(jarOutputStream, "META-INF/versions/14/multi-release.dat", 14);
100100
writeEntry(jarOutputStream, "META-INF/versions/15/multi-release.dat", 15);
101+
writeEntry(jarOutputStream, "META-INF/versions/16/multi-release.dat", 16);
101102
}
102103
else {
103104
writeEntry(jarOutputStream, "3.dat", 3);

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Collections;
2222
import java.util.List;
2323
import java.util.Optional;
24+
import java.util.stream.Stream;
2425

2526
import org.springframework.util.ClassUtils;
2627

@@ -71,7 +72,12 @@ public enum JavaVersion {
7172
/**
7273
* Java 15.
7374
*/
74-
FIFTEEN("15", CharSequence.class, "isEmpty");
75+
FIFTEEN("15", CharSequence.class, "isEmpty"),
76+
77+
/**
78+
* Java 16.
79+
*/
80+
SIXTEEN("16", Stream.class, "toList");
7581

7682
private final String name;
7783

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

+6
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,10 @@ void currentJavaVersionFifteen() {
127127
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.FIFTEEN);
128128
}
129129

130+
@Test
131+
@EnabledOnJre(JRE.JAVA_16)
132+
void currentJavaVersionSixteen() {
133+
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN);
134+
}
135+
130136
}

0 commit comments

Comments
 (0)