Browse Source

Align JavaVersion.NINE name with JDK versioning

See gh-17611
pull/17636/head
dreis2211 7 years ago committed by Stephane Nicoll
parent
commit
c8097692ea
  1. 4
      spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java
  2. 4
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/system/JavaVersion.java

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

@ -80,14 +80,14 @@ class ConditionalOnJavaTests { @@ -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

@ -38,9 +38,9 @@ public enum JavaVersion { @@ -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.

Loading…
Cancel
Save