Merge branch '2.2.x' into 2.3.x

Closes gh-22849
2020-08-10 16:05:13 +02:00
parent 2b578296f9 afe99ad64c
commit 980ddcffd0
5 changed files with 68 additions and 7 deletions
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EndpointId.java
@@ -131,7 +131,7 @@ public final class EndpointId {

 	private static String migrateLegacyId(Environment environment, String value) {
 		if (environment.getProperty(MIGRATE_LEGACY_NAMES_PROPERTY, Boolean.class, false)) {
-			return value.replace(".", "");
+			return value.replaceAll("[-.]+", "");
 		}
 		return value;
 	}