Merge branch '2.7.x' into 3.0.x

Closes gh-35763
spring-projects · Jun 7, 2023 · 9149fc3 · 9149fc3
2 parents d5d2050 + 2927d50
commit 9149fc3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 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-2022 the original author or authors.
+ * Copyright 2012-2023 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.
@@ -30,6 +30,7 @@
  *
  * @author Oliver Gierke
  * @author Phillip Webb
+ * @author Moritz Halbritter
  * @since 2.0.0
  */
 public enum JavaVersion {
@@ -47,7 +48,12 @@ public enum JavaVersion {
 	/**
 	 * Java 19.
 	 */
-	NINETEEN("19", Future.class, "state");
+	NINETEEN("19", Future.class, "state"),
+
+	/**
+	 * Java 20.
+	 */
+	TWENTY("20", Class.class, "accessFlags");
 
 	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
@@ -97,4 +97,10 @@ void currentJavaVersionNineteen() {
 		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.NINETEEN);
 	}
 
+	@Test
+	@EnabledOnJre(JRE.JAVA_20)
+	void currentJavaVersionTwenty() {
+		assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY);
+	}
+
 }