Merge branch '1.5.x'

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -1173,5 +1173,6 @@ content into your application; rather pick only the properties that you need.
 	# ----------------------------------------
 
 	spring.test.database.replace=any # Type of existing DataSource to replace.
+	spring.test.mockmvc.print=default # MVC Print option.
 
 ----

spring-boot-test-autoconfigure/pom.xml

@@ -121,12 +121,6 @@
 			<artifactId>spring-security-test</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<!-- Annotation processing -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-boot-test-autoconfigure/src/main/resources/META-INF/spring-configuration-metadata.json

@@ -5,6 +5,12 @@
       "type": "org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase$Replace",
       "description": "Type of existing DataSource to replace.",
       "defaultValue": "any"
+    },
+    {
+      "name": "spring.test.mockmvc.print",
+      "type": "org.springframework.boot.test.autoconfigure.web.servlet.MockMvcPrint",
+      "description": "MVC Print option.",
+      "defaultValue": "default"
     }
   ]
 }