From e8acbc1fbaddbd63db410a33899ab4b37d64c454 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 4 Mar 2024 10:15:59 +0000 Subject: [PATCH] Add TWENTY_TWO to JavaVersion enum Closes gh-39825 --- .../org/springframework/boot/system/JavaVersion.java | 10 ++++++++-- .../springframework/boot/system/JavaVersionTests.java | 8 +++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java index 2c01b4ea7eb..7f48a38914b 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -64,7 +64,13 @@ public enum JavaVersion { * Java 21. * @since 2.7.16 */ - TWENTY_ONE("21", SortedSet.class, "getFirst"); + TWENTY_ONE("21", SortedSet.class, "getFirst"), + + /** + * Java 22. + * @since 3.2.4 + */ + TWENTY_TWO("22", Console.class, "isTerminal"); private final String name; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java index d87c1230f70..84a4494f5b8 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 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. @@ -109,4 +109,10 @@ class JavaVersionTests { assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_ONE); } + @Test + @EnabledOnJre(JRE.JAVA_22) + void currentJavaVersionTwentyTwo() { + assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.TWENTY_TWO); + } + }