Merge branch '3.4.x'

philwebb · philwebb · commit 2460a72928e3 · 2025-05-08T12:16:08.000-07:00
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
@@ -148,7 +148,7 @@ void withFile(CapturedOutput output) {
 		Configuration configuration = this.loggingSystem.getConfiguration();
 		assertThat(output).contains("Hello world").doesNotContain("Hidden");
 		assertThat(new File(tmpDir() + "/spring.log")).exists();
-		assertThat(configuration.getConfigurationSource().getLocation()).contains("/log4j2-file.xml");
+		assertThat(configuration.getConfigurationSource().getLocation()).contains("log4j2-file.xml");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ void withFile(CapturedOutput output) {`
`148`	`148`	`Configuration configuration = this.loggingSystem.getConfiguration();`
`149`	`149`	`assertThat(output).contains("Hello world").doesNotContain("Hidden");`
`150`	`150`	`assertThat(new File(tmpDir() + "/spring.log")).exists();`
`151`		`- assertThat(configuration.getConfigurationSource().getLocation()).contains("/log4j2-file.xml");`
	`151`	`+ assertThat(configuration.getConfigurationSource().getLocation()).contains("log4j2-file.xml");`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`@Test`