Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17611 from dreis2211

Browse Source 
* pr/17611:
  Align JavaVersion.NINE name with JDK versioning

Closes gh-17611
This commit is contained in:
Stephane Nicoll
2019-07-24 11:12:35 +02:00
parent 2e0ad19d8d c8097692ea
commit 1215495d44
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java
View File

@@ -80,14 +80,14 @@ class ConditionalOnJavaTests {
void equalOrNewerMessage() {
ConditionOutcome outcome = this.condition.getMatchOutcome(Range.EQUAL_OR_NEWER, JavaVersion.NINE,
JavaVersion.EIGHT);
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (1.8 or newer) found 1.9");
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (1.8 or newer) found 9");
}
@Test
void olderThanMessage() {
ConditionOutcome outcome = this.condition.getMatchOutcome(Range.OLDER_THAN, JavaVersion.NINE,
JavaVersion.EIGHT);
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (older than 1.8) found 1.9");
assertThat(outcome.getMessage()).isEqualTo("@ConditionalOnJava (older than 1.8) found 9");
}
@Test

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

@@ -38,9 +38,9 @@ public enum JavaVersion {
EIGHT("1.8", Optional.class, "empty"),
/**
* Java 1.9.
* Java 9.
*/
NINE("1.9", Optional.class, "stream"),
NINE("9", Optional.class, "stream"),
/**
* Java 10.