Merge pull request #16262 from mrifni

* pr/16262:
  Polish "Automatically detect log4j2.properties"
  Automatically detect log4j2.properties

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2018 the original author or authors.
+ * Copyright 2012-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,6 +112,7 @@ protected String[] getStandardConfigLocations() {
 
 	private String[] getCurrentlySupportedConfigLocations() {
 		List<String> supportedConfigLocations = new ArrayList<>();
+		supportedConfigLocations.add("log4j2.properties");
 		if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) {
 			Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml");
 		}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java

@@ -211,7 +211,7 @@ public void loggingThatUsesJulIsCaptured() {
 	@Test
 	public void configLocationsWithNoExtraDependencies() {
 		assertThat(this.loggingSystem.getStandardConfigLocations())
-				.contains("log4j2.xml");
+				.contains("log4j2.properties", "log4j2.xml");
 	}
 
 	@Test
@@ -241,7 +241,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