diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java index 5af086173b90..02950d583811 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java @@ -112,6 +112,7 @@ protected String[] getStandardConfigLocations() { private String[] getCurrentlySupportedConfigLocations() { List supportedConfigLocations = new ArrayList<>(); + supportedConfigLocations.add("log4j2.properties"); if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) { Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml"); } 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 index 8312648e4f84..ad5d938d9f98 100644 --- 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 @@ -210,7 +210,7 @@ public void loggingThatUsesJulIsCaptured() { @Test public void configLocationsWithNoExtraDependencies() { assertThat(this.loggingSystem.getStandardConfigLocations()) - .contains("log4j2.xml"); + .contains("log4j2.properties", "log4j2.xml"); } @Test @@ -240,7 +240,8 @@ public void configLocationsWithJacksonDatabindAndDataformatYaml() { @Test public void springConfigLocations() { String[] locations = getSpringConfigLocations(this.loggingSystem); - assertThat(locations).isEqualTo(new String[] { "log4j2-spring.xml" }); + assertThat(locations).isEqualTo( + new String[] { "log4j2-spring.properties", "log4j2-spring.xml" }); } @Test