From c8097692ea77aebd407811f458e3897ef9333898 Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Tue, 23 Jul 2019 17:03:27 +0200 Subject: [PATCH] Align JavaVersion.NINE name with JDK versioning See gh-17611 --- .../boot/autoconfigure/condition/ConditionalOnJavaTests.java | 4 ++-- .../java/org/springframework/boot/system/JavaVersion.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java index 3144d7556db..d445c720fd1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJavaTests.java @@ -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 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 89c141cf4b5..7bce2652fc4 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 @@ -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.