Merge branch '1.5.x'

2017-01-24 13:23:06 +01:00
parent 2b75570680 5d95fb6d56
commit d67ce78e8b
7 changed files with 9 additions and 10 deletions
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/AuditEventTests.java
@@ -83,7 +83,6 @@ public class AuditEventTests {
 				Collections.singletonMap("type", (Object) "BadCredentials"));
 		String json = Jackson2ObjectMapperBuilder.json().build()
 				.writeValueAsString(event);
-		System.out.println(json);
 		JSONObject jsonObject = new JSONObject(json);
 		assertThat(jsonObject.getString("type")).isEqualTo("UNKNOWN");
 		assertThat(jsonObject.getJSONObject("data").getString("type"))