Skip to content

Commit 4780d5d

Browse files
committed
Merge branch '4.0.x'
Closes spring-projectsgh-49194
2 parents 269d126 + c414ec2 commit 4780d5d

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,13 @@ public enum JavaVersion {
9494
* Java 25.
9595
* @since 3.5.7
9696
*/
97-
TWENTY_FIVE("25", Reader.class, "readAllLines");
97+
TWENTY_FIVE("25", Reader.class, "readAllLines"),
98+
99+
/**
100+
* Java 26.
101+
* @since 4.0.3
102+
*/
103+
TWENTY_SIX("26", String.class, "equalsFoldCase", String.class);
98104

99105
private final String name;
100106

core/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
@@ -133,4 +133,10 @@ void currentJavaVersionTwentyFive() {
133133
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_FIVE);
134134
}
135135

136+
@Test
137+
@EnabledOnJre(JRE.JAVA_26)
138+
void currentJavaVersionTwentySix() {
139+
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_SIX);
140+
}
141+
136142
}

0 commit comments

Comments
 (0)