Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/LoggersMvcEndpointTests.java

@@ -95,7 +95,6 @@ public class LoggersMvcEndpointTests {
 				.singletonList(new LoggerConfiguration("ROOT", null, LogLevel.DEBUG)));
 		String expected = "{\"levels\":[\"OFF\",\"FATAL\",\"ERROR\",\"WARN\",\"INFO\",\"DEBUG\",\"TRACE\"],"
 				+ "\"loggers\":{\"ROOT\":{\"configuredLevel\":null,\"effectiveLevel\":\"DEBUG\"}}}";
-		System.out.println(expected);
 		this.mvc.perform(get("/loggers")).andExpect(status().isOk())
 				.andExpect(content().json(expected));
 	}

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersAutoConfigurationTests.java

@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.web;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
@@ -220,10 +219,6 @@ public class HttpMessageConvertersAutoConfigurationTests {
 				RepositoryRestMvcConfiguration.class,
 				HttpMessageConvertersAutoConfiguration.class);
 		this.context.refresh();
-
-		Map<String, MappingJackson2HttpMessageConverter> beansOfType = this.context
-				.getBeansOfType(MappingJackson2HttpMessageConverter.class);
-		System.out.println(beansOfType);
 		BeanDefinition beanDefinition = this.context
 				.getBeanDefinition("mappingJackson2HttpMessageConverter");
 		assertThat(beanDefinition.getFactoryBeanName()).isEqualTo(

spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java

@@ -139,7 +139,6 @@ public class ResourceMatcherTests {
 				.find(Arrays.asList(new File("src/test/resources/resource-matcher/one"),
 						new File("src/test/resources/resource-matcher/two"),
 						new File("src/test/resources/resource-matcher/three")));
-		System.out.println(matchedResources);
 		List<String> paths = new ArrayList<String>();
 		for (MatchedResource resource : matchedResources) {
 			paths.add(resource.getName());