Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Java 17 to JavaVersion enum #26769

Closed
wants to merge 2 commits into from
Closed

Add Java 17 to JavaVersion enum #26769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
827a441
Add Java 17 to JavaVersion enum
dreis2211 Jun 5, 2021
77da1fd
Update copyright of changed file
dreis2211 Jun 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions ...g-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
Expand All @@ -16,6 +16,7 @@

package org.springframework.boot.system;

import java.io.Console;
import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -77,7 +78,12 @@ public enum JavaVersion {
/**
* Java 16.
*/
SIXTEEN("16", Stream.class, "toList");
SIXTEEN("16", Stream.class, "toList"),

/**
* Java 17.
*/
SEVENTEEN("17", Console.class, "charset");

private final String name;

Expand Down
8 changes: 7 additions & 1 deletion ...t-project/spring-boot/src/test/java/org/springframework/boot/system/JavaVersionTests.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 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.
Expand Down Expand Up @@ -133,4 +133,10 @@ void currentJavaVersionSixteen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SIXTEEN);
}

@Test
@EnabledOnJre(JRE.JAVA_17)
void currentJavaVersionSeventeen() {
assertThat(JavaVersion.getJavaVersion()).isEqualTo(JavaVersion.SEVENTEEN);
}

}