From 605ec2fb0ee09f163fb1d1bcf52d119c3064ee7f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 4 Jan 2022 16:10:02 +0100 Subject: [PATCH] Polish "Add vendor version to JavaInfo" See gh-29090 --- .../java/org/springframework/boot/info/JavaInfo.java | 10 ++++++---- .../org/springframework/boot/info/JavaInfoTests.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java index 9f246bba08..778abd6de9 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/info/JavaInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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. @@ -57,10 +57,13 @@ public class JavaInfo { } /** - * Information about the Java Vendor of the used Java Runtime. + * Information about the Java Vendor of the Java Runtime the application is running + * in. + * * @since 2.7.0 */ public static class JavaVendorInfo { + private final String name; private final String version; @@ -77,11 +80,11 @@ public class JavaInfo { public String getVersion() { return this.version; } + } /** * Information about the Java Runtime Environment the application is running in. - * @since 2.6.0 */ public static class JavaRuntimeEnvironmentInfo { @@ -106,7 +109,6 @@ public class JavaInfo { /** * Information about the Java Virtual Machine the application is running in. - * @since 2.6.0 */ public static class JavaVirtualMachineInfo { diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/JavaInfoTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/JavaInfoTests.java index 5bf692a6ce..153d4dff31 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/JavaInfoTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/info/JavaInfoTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 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.