Merge branch '3.0.x' into 3.1.x

Closes gh-36735
spring-projects · Aug 4, 2023 · 2e37b0a · 2e37b0a
2 parents d89d14b + de632dd
commit 2e37b0a
Showing 1 changed file with 4 additions and 0 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
@@ -37,21 +37,25 @@ public enum JavaVersion {
 
 	/**
 	 * Java 17.
+	 * @since 2.5.3
 	 */
 	SEVENTEEN("17", Console.class, "charset"),
 
 	/**
 	 * Java 18.
+	 * @since 2.5.11
 	 */
 	EIGHTEEN("18", Duration.class, "isPositive"),
 
 	/**
 	 * Java 19.
+	 * @since 2.6.12
 	 */
 	NINETEEN("19", Future.class, "state"),
 
 	/**
 	 * Java 20.
+	 * @since 2.7.13
 	 */
 	TWENTY("20", Class.class, "accessFlags");