Introduce log4j 2 for Spring's test suite

This commit adds a test runtime dependency on log4j 2 for every project
and migrates all log4j.properties files to log4j2-test.xml files.

Issue: SPR-14431

Author: sbrannen

build.gradle

@@ -58,6 +58,7 @@ configure(allprojects) { project ->
 	ext.junitVersion         = "4.12"
 	ext.junitJupiterVersion  = '5.0.0-SNAPSHOT'
 	ext.junitPlatformVersion = '1.0.0-SNAPSHOT'
+	ext.log4JVersion         = '2.6.1'
 	ext.nettyVersion         = "4.1.1.Final"
 	ext.okhttpVersion        = "2.7.5"
 	ext.okhttp3Version       = "3.3.1"
@@ -139,6 +140,9 @@ configure(allprojects) { project ->
 		}
 		testCompile("org.hamcrest:hamcrest-all:${hamcrestVersion}")
 
+		testRuntime("org.apache.logging.log4j:log4j-core:${log4JVersion}")
+		testRuntime("org.apache.logging.log4j:log4j-jcl:${log4JVersion}")
+
 		sniffer("org.codehaus.mojo:animal-sniffer-ant-tasks:${snifferVersion}")
 		javaApiSignature("org.codehaus.mojo.signature:java18:1.0@signature")
 	}

spring-aop/src/test/resources/log4j.properties

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.aop" level="warn" />
+		<Root level="error">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>

spring-aop/src/test/resources/log4j2-test.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.beans" level="warn" />
+		<Root level="error">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>

spring-aspects/src/test/resources/log4j.properties

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.beans" level="warn" />
+		<Root level="error">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>

spring-aspects/src/test/resources/log4j2-test.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
+		</Console>
+	</Appenders>
+	<Loggers>
+		<Logger name="org.springframework.beans" level="warn" />
+		<Logger name="org.springframework.cache" level="warn" />
+		<Logger name="org.springframework.mail" level="warn" />
+		<Root level="error">
+			<AppenderRef ref="Console" />
+		</Root>
+	</Loggers>
+</Configuration>

spring-beans/src/test/resources/log4j.properties

@@ -53,6 +53,7 @@
  *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
 public class AutowiredConfigurationTests {
 
@@ -203,20 +204,23 @@ public void testCustomPropertiesWithClassPathContext() throws IOException {
 
 		TestBean testBean = context.getBean("testBean", TestBean.class);
 		assertThat(testBean.getName(), equalTo("localhost"));
-		assertThat(testBean.getAge(), equalTo((int) new ClassPathResource("log4j.properties").contentLength()));
+		assertThat(testBean.getAge(), equalTo(contentLength()));
 	}
 
 	@Test
 	public void testCustomPropertiesWithGenericContext() throws IOException {
 		GenericApplicationContext context = new GenericApplicationContext();
-		// context.setResourceLoader(new FileSystemResourceLoader());
 		new XmlBeanDefinitionReader(context).loadBeanDefinitions(
 				new ClassPathResource("AutowiredConfigurationTests-custom.xml", AutowiredConfigurationTests.class));
 		context.refresh();
 
 		TestBean testBean = context.getBean("testBean", TestBean.class);
 		assertThat(testBean.getName(), equalTo("localhost"));
-		assertThat(testBean.getAge(), equalTo((int) new ClassPathResource("log4j.properties").contentLength()));
+		assertThat(testBean.getAge(), equalTo(contentLength()));
+	}
+
+	private int contentLength() throws IOException {
+		return (int) new ClassPathResource("do_not_delete_me.txt").contentLength();
 	}
 
 
@@ -477,7 +481,7 @@ public void setHostname(String hostname) {
 			this.hostname = hostname;
 		}
 
-		@Value("log4j.properties")
+		@Value("do_not_delete_me.txt")
 		public void setResource(Resource resource) {
 			this.resource = resource;
 		}