Merge branch '2.2.x' into 2.3.x

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/logging/LoggingApplicationListenerTests.java

@@ -163,9 +163,8 @@ class LoggingApplicationListenerTests {
 	@Test
 	void overrideConfigDoesNotExist() {
 		addPropertiesToEnvironment(this.context, "logging.config=doesnotexist.xml");
-		assertThatIllegalStateException().isThrownBy(() -> {
-			this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader());
-		});
+		assertThatIllegalStateException().isThrownBy(
+				() -> this.initializer.initialize(this.context.getEnvironment(), this.context.getClassLoader()));
 		assertThat(this.output)
 				.contains("Logging system failed to initialize using configuration from 'doesnotexist.xml'")
 				.doesNotContain("JoranException");