Merge branch '1.5.x'

9 years ago · 1df3fb6ecb
1 changed files with 2 additions and 2 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
@ -337,7 +337,7 @@ public class EndpointMBeanExporterTests {
				@@ -337,7 +337,7 @@ public class EndpointMBeanExporterTests {
 			extends AbstractEndpoint<Map<String, Object>> {

 		public JsonMapConversionEndpoint() {
-			super("json-map-conversion");
+			super("json_map_conversion");
 		}

 		@Override
@ -353,7 +353,7 @@ public class EndpointMBeanExporterTests {
				@@ -353,7 +353,7 @@ public class EndpointMBeanExporterTests {
 			extends AbstractEndpoint<List<Object>> {

 		public JsonListConversionEndpoint() {
-			super("json-list-conversion");
+			super("json_list_conversion");
 		}

 		@Override