From de897b9b7228e6e26811cfdd5f6da4aca9ea1afe Mon Sep 17 00:00:00 2001 From: lltx <50090230+lltx@users.noreply.github.com> Date: Sat, 13 Jun 2020 12:43:21 +0800 Subject: [PATCH 1/2] Fix wrong property reference to keys-to-sanitize in Javadoc See gh-21906 --- .../properties/ConfigurationPropertiesReportEndpoint.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java index 88a51d12c87..4abfd44c480 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java @@ -71,8 +71,9 @@ import org.springframework.util.StringUtils; *

* To protect sensitive information from being exposed, certain property values are masked * if their names end with a set of configurable values (default "password" and "secret"). - * Configure property names by using {@code endpoints.configprops.keys_to_sanitize} in - * your Spring Boot application configuration. + * Configure property names by using + * {@code management.endpoint.configprops.keys-to-sanitize} in your Spring Boot + * application configuration. * * @author Christian Dupuis * @author Dave Syer From ec8c1e386036d4b8893deaf64a8af67b72eb617d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 15 Jun 2020 08:39:08 +0200 Subject: [PATCH 2/2] Update copyright year of changed files See gh-21906 --- .../properties/ConfigurationPropertiesReportEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java index 4abfd44c480..39c3ffeb3ac 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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.