spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source 
Closes gh-49194
This commit is contained in:
Andy Wilkinson
2026-02-11 13:57:06 +00:00
parent 269d126e36 c414ec241d
commit 4780d5dc81
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
+7 -1
View File
@@ -94,7 +94,13 @@ public enum JavaVersion {
* Java 25.
* @since 3.5.7
*/
TWENTY_FIVE("25", Reader.class, "readAllLines");
TWENTY_FIVE("25", Reader.class, "readAllLines"),
/**
* Java 26.
* @since 4.0.3
*/
TWENTY_SIX("26", String.class, "equalsFoldCase", String.class);
private final String name;
core/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java
+6
View File
@@ -133,4 +133,10 @@ class JavaVersionTests {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_FIVE);
}
@Test
@EnabledOnJre(JRE.JAVA_26)
void currentJavaVersionTwentySix() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_SIX);
}
}