Merge branch '1.5.x'

spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml

@@ -19,6 +19,7 @@
 		<main.basedir>${basedir}/../..</main.basedir>
 	</properties>
 	<dependencies>
+		<!-- Compile -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -33,7 +34,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -46,7 +46,7 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
-		
+		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorLog4J2ApplicationTests.java

@@ -46,7 +46,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @AutoConfigureMockMvc
 public class SampleActuatorLog4J2ApplicationTests {
 
-	private static final Logger logger = LogManager.getLogger(SampleActuatorLog4J2ApplicationTests.class);
+	private static final Logger logger = LogManager
+			.getLogger(SampleActuatorLog4J2ApplicationTests.class);
 
 	@Rule
 	public OutputCapture output = new OutputCapture();
@@ -64,8 +65,8 @@ public class SampleActuatorLog4J2ApplicationTests {
 	public void validateLoggersEndpoint() throws Exception {
 		this.mvc.perform(get("/loggers/org.apache.coyote.http11.Http11NioProtocol"))
 				.andExpect(status().isOk())
-				.andExpect(content().string(equalTo(
-						"{\"configuredLevel\":\"WARN\"," + "\"effectiveLevel\":\"WARN\"}")));
+				.andExpect(content().string(equalTo("{\"configuredLevel\":\"WARN\","
+						+ "\"effectiveLevel\":\"WARN\"}")));
 	}
 
 }