Merge branch '2.6.x' into 2.7.x

Closes spring-projectsgh-32260

Author: wilkinsona

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

@@ -23,6 +23,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.Future;
 import java.util.stream.Stream;
 
 import org.springframework.util.ClassUtils;
@@ -89,7 +90,12 @@ public enum JavaVersion {
 	/**
 	 * Java 18.
 	 */
-	EIGHTEEN("18", Duration.class, "isPositive");
+	EIGHTEEN("18", Duration.class, "isPositive"),
+
+	/**
+	 * Java 19.
+	 */
+	NINETEEN("19", Future.class, "state");
 
 	private final String name;
 

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.system;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.condition.EnabledOnJre;
 import org.junit.jupiter.api.condition.JRE;
 
@@ -145,4 +146,14 @@ void currentJavaVersionEighteen() {
 		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.EIGHTEEN);
 	}
 
+	@Test
+	@EnabledIf("java19")
+	void currentJavaVersionNineteen() {
+		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
+	}
+
+	static boolean java19() {
+		return "19".equals(System.getProperty("java.version"));
+	}
+
 }