Merge branch '2.5.x' into 2.6.x

Closes gh-30132
spring-projects · Mar 9, 2022 · b1be6ac · b1be6ac
2 parents b0e4cab + 314acd3
commit b1be6ac
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/...g-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java b/...g-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import java.io.Console;
 import java.lang.invoke.MethodHandles;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -83,7 +84,12 @@ public enum JavaVersion {
 	/**
 	 * Java 17.
 	 */
-	SEVENTEEN("17", Console.class, "charset");
+	SEVENTEEN("17", Console.class, "charset"),
+
+	/**
+	 * Java 18.
+	 */
+	EIGHTEEN("18", Duration.class, "isPositive");
 
 	private final String name;
 

diff --git a/...t-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java b/...t-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -139,4 +139,10 @@ void currentJavaVersionSeventeen() {
 		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SEVENTEEN);
 	}
 
+	@Test
+	@EnabledOnJre(JRE.JAVA_18)
+	void currentJavaVersionEighteen() {
+		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
+	}
+
 }