diff --git a/build.gradle b/build.gradle index 16bf783e319..6c19d6c7cfd 100644 --- a/build.gradle +++ b/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") } diff --git a/spring-aop/src/test/resources/log4j.properties b/spring-aop/src/test/resources/log4j.properties deleted file mode 100644 index d822d6b1e8f..00000000000 --- a/spring-aop/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.aop=TRACE - diff --git a/spring-aop/src/test/resources/log4j2-test.xml b/spring-aop/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..78b880bbcd8 --- /dev/null +++ b/spring-aop/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-aspects/src/test/resources/log4j.properties b/spring-aspects/src/test/resources/log4j.properties deleted file mode 100644 index f400f08f05b..00000000000 --- a/spring-aspects/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework=TRACE diff --git a/spring-aspects/src/test/resources/log4j2-test.xml b/spring-aspects/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..f5e85a2eac8 --- /dev/null +++ b/spring-aspects/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-beans/src/test/resources/log4j.properties b/spring-beans/src/test/resources/log4j.properties deleted file mode 100644 index c4b279dca37..00000000000 --- a/spring-beans/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=ERROR, console -log4j.logger.org.springframework.beans.factory.config.DeprecatedBeanWarnerTests$MyDeprecatedBeanWarner=WARN - -#log4j.logger.org.springframework.beans=TRACE - diff --git a/spring-beans/src/test/resources/log4j2-test.xml b/spring-beans/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..f5e85a2eac8 --- /dev/null +++ b/spring-beans/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-context-support/src/test/resources/log4j.properties b/spring-context-support/src/test/resources/log4j.properties deleted file mode 100644 index 3195815d7d7..00000000000 --- a/spring-context-support/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.cache=TRACE -#log4j.logger.org.springframework.mail=TRACE diff --git a/spring-context-support/src/test/resources/log4j2-test.xml b/spring-context-support/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..ee1cd2ad04a --- /dev/null +++ b/spring-context-support/src/test/resources/log4j2-test.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java index cedd45bd556..1c2cc1afef1 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java @@ -53,6 +53,7 @@ import static org.junit.Assert.*; * * @author Chris Beams * @author Juergen Hoeller + * @author Sam Brannen */ public class AutowiredConfigurationTests { @@ -203,20 +204,23 @@ public class AutowiredConfigurationTests { 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 class AutowiredConfigurationTests { this.hostname = hostname; } - @Value("log4j.properties") + @Value("do_not_delete_me.txt") public void setResource(Resource resource) { this.resource = resource; } diff --git a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java index f744427a926..1c2ffdcf294 100644 --- a/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java +++ b/spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -29,6 +29,7 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.junit.Test; import org.springframework.beans.factory.ObjectFactory; @@ -61,6 +62,7 @@ import static org.junit.Assert.*; /** * @author Juergen Hoeller + * @author Sam Brannen * @since 3.0 */ public class ApplicationContextExpressionTests { @@ -326,11 +328,10 @@ public class ApplicationContextExpressionTests { @Test public void resourceInjection() throws IOException { - System.setProperty("logfile", "log4j.properties"); - try { - AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(ResourceInjectionBean.class); + System.setProperty("logfile", "do_not_delete_me.txt"); + try (AnnotationConfigApplicationContext ac = new AnnotationConfigApplicationContext(ResourceInjectionBean.class)) { ResourceInjectionBean resourceInjectionBean = ac.getBean(ResourceInjectionBean.class); - Resource resource = new ClassPathResource("log4j.properties"); + Resource resource = new ClassPathResource("do_not_delete_me.txt"); assertEquals(resource, resourceInjectionBean.resource); assertEquals(resource.getURL(), resourceInjectionBean.url); assertEquals(resource.getURI(), resourceInjectionBean.uri); diff --git a/spring-context/src/test/resources/do_not_delete_me.txt b/spring-context/src/test/resources/do_not_delete_me.txt new file mode 100644 index 00000000000..25f06fe4182 --- /dev/null +++ b/spring-context/src/test/resources/do_not_delete_me.txt @@ -0,0 +1 @@ +Please do not delete me; otherwise, you'll break some tests. \ No newline at end of file diff --git a/spring-context/src/test/resources/log4j.properties b/spring-context/src/test/resources/log4j.properties deleted file mode 100644 index 8d5d6be32f7..00000000000 --- a/spring-context/src/test/resources/log4j.properties +++ /dev/null @@ -1,9 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.core=INFO - -#log4j.logger.org.springframework=TRACE - diff --git a/spring-context/src/test/resources/log4j2-test.xml b/spring-context/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..04c4fbc44c0 --- /dev/null +++ b/spring-context/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-core/src/test/resources/log4j.properties b/spring-core/src/test/resources/log4j.properties deleted file mode 100644 index e9825a9de9f..00000000000 --- a/spring-core/src/test/resources/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.core.convert=WARN -log4j.logger.org.springframework.core.GenericTypeResolver=WARN - -#log4j.logger.org.springframework.core=TRACE -#log4j.logger.org.springframework.util=TRACE - diff --git a/spring-core/src/test/resources/log4j2-test.xml b/spring-core/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..07999082b99 --- /dev/null +++ b/spring-core/src/test/resources/log4j2-test.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-expression/src/test/resources/log4j.properties b/spring-expression/src/test/resources/log4j.properties deleted file mode 100644 index 2997213eb5e..00000000000 --- a/spring-expression/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.expression=TRACE - diff --git a/spring-expression/src/test/resources/log4j2-test.xml b/spring-expression/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..a617bb543ad --- /dev/null +++ b/spring-expression/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-instrument/src/test/resources/log4j.properties b/spring-instrument/src/test/resources/log4j.properties deleted file mode 100644 index b09656a10fa..00000000000 --- a/spring-instrument/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.instrument=TRACE - diff --git a/spring-instrument/src/test/resources/log4j2-test.xml b/spring-instrument/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..4effcf32c91 --- /dev/null +++ b/spring-instrument/src/test/resources/log4j2-test.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/spring-jdbc/src/test/resources/log4j.properties b/spring-jdbc/src/test/resources/log4j.properties deleted file mode 100644 index 5d1ef552e50..00000000000 --- a/spring-jdbc/src/test/resources/log4j.properties +++ /dev/null @@ -1,16 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%-5p] [%c] - %m%n - -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=bin/spring-jdbc.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=ERROR, console, file - -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.jdbc=TRACE -#log4j.logger.org.springframework.jdbc.datasource.embedded=INFO diff --git a/spring-jdbc/src/test/resources/log4j2-test.xml b/spring-jdbc/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..331b1f344df --- /dev/null +++ b/spring-jdbc/src/test/resources/log4j2-test.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/spring-jms/src/test/resources/log4j.properties b/spring-jms/src/test/resources/log4j.properties deleted file mode 100644 index 0c847ca90d0..00000000000 --- a/spring-jms/src/test/resources/log4j.properties +++ /dev/null @@ -1,11 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - - -#log4j.logger.org.springframework.jms=TRACE - diff --git a/spring-jms/src/test/resources/log4j2-test.xml b/spring-jms/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..7ce30d928f3 --- /dev/null +++ b/spring-jms/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-messaging/src/test/resources/log4j.properties b/spring-messaging/src/test/resources/log4j.properties deleted file mode 100644 index d8c61d7307e..00000000000 --- a/spring-messaging/src/test/resources/log4j.properties +++ /dev/null @@ -1,13 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.messaging=DEBUG -log4j.logger.org.apache.activemq=INFO - -# Enable TRACE level to chase integration test issues on CI servers -log4j.logger.org.springframework.messaging.simp.stomp=TRACE -log4j.logger.reactor=DEBUG -log4j.logger.io.netty=INFO - diff --git a/spring-messaging/src/test/resources/log4j2-test.xml b/spring-messaging/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..67aae9ce2e5 --- /dev/null +++ b/spring-messaging/src/test/resources/log4j2-test.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/spring-orm/src/test/resources/log4j.properties b/spring-orm/src/test/resources/log4j.properties deleted file mode 100644 index e9bf33ac0b7..00000000000 --- a/spring-orm/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=INFO, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.orm=TRACE - diff --git a/spring-orm/src/test/resources/log4j2-test.xml b/spring-orm/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..2479a3ff3ab --- /dev/null +++ b/spring-orm/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-oxm/src/test/resources/log4j.properties b/spring-oxm/src/test/resources/log4j.properties deleted file mode 100644 index 0722759dd9f..00000000000 --- a/spring-oxm/src/test/resources/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=INFO, console - -#log4j.logger.org.springframework.oxm=TRACE - diff --git a/spring-oxm/src/test/resources/log4j2-test.xml b/spring-oxm/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..81b17cc2219 --- /dev/null +++ b/spring-oxm/src/test/resources/log4j2-test.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/spring-test/src/test/resources/log4j.properties b/spring-test/src/test/resources/log4j.properties deleted file mode 100644 index 258e7b8425c..00000000000 --- a/spring-test/src/test/resources/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%-5p] [%c] - %m%n - -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=bin/spring-test.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=ERROR, console, file - -log4j.logger.org.springframework.beans=WARN - -log4j.logger.org.springframework.test.context=WARN -log4j.logger.org.springframework.test.context.TestContext=WARN -log4j.logger.org.springframework.test.context.TestContextManager=WARN -log4j.logger.org.springframework.test.context.ContextLoaderUtils=WARN -log4j.logger.org.springframework.test.context.cache=WARN -log4j.logger.org.springframework.test.context.junit4.rules=WARN -log4j.logger.org.springframework.test.context.transaction.TransactionalTestExecutionListener=WARN -log4j.logger.org.springframework.test.context.web=WARN - -#log4j.logger.org.springframework.test.context.support=INFO -#log4j.logger.org.springframework.test.context.support.DelegatingSmartContextLoader=INFO -#log4j.logger.org.springframework.test.context.support.AbstractGenericContextLoader=INFO -#log4j.logger.org.springframework.test.context.support.AnnotationConfigContextLoader=INFO - -# The following must be kept at DEBUG in order to test SPR-14363. -log4j.logger.org.springframework.test.util=DEBUG - -log4j.logger.org.springframework.test.web.servlet.result=DEBUG - -#log4j.logger.org.springframework.test=TRACE - diff --git a/spring-test/src/test/resources/log4j2-test.xml b/spring-test/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..533f9aa9ff8 --- /dev/null +++ b/spring-test/src/test/resources/log4j2-test.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-tx/src/test/resources/log4j.properties b/spring-tx/src/test/resources/log4j.properties deleted file mode 100644 index 2e0e4bdaafe..00000000000 --- a/spring-tx/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.transaction=INFO - -#log4j.logger.org.springframework.transaction=TRACE - diff --git a/spring-tx/src/test/resources/log4j2-test.xml b/spring-tx/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..993ea541a1e --- /dev/null +++ b/spring-tx/src/test/resources/log4j2-test.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/spring-web/src/test/resources/log4j.properties b/spring-web/src/test/resources/log4j.properties deleted file mode 100644 index d2fa6864853..00000000000 --- a/spring-web/src/test/resources/log4j.properties +++ /dev/null @@ -1,12 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.binding=DEBUG - -#log4j.logger.org.springframework.http=TRACE -#log4j.logger.org.springframework.remoting=TRACE -#log4j.logger.org.springframework.web=TRACE - diff --git a/spring-web/src/test/resources/log4j2-test.xml b/spring-web/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..ea049cbca73 --- /dev/null +++ b/spring-web/src/test/resources/log4j2-test.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/spring-webmvc/src/test/resources/log4j.properties b/spring-webmvc/src/test/resources/log4j.properties deleted file mode 100644 index 14b26693fa6..00000000000 --- a/spring-webmvc/src/test/resources/log4j.properties +++ /dev/null @@ -1,10 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console -log4j.logger.org.springframework.beans=WARN -log4j.logger.org.springframework.convert=DEBUG - -#log4j.logger.org.springframework.web.servlet=TRACE - diff --git a/spring-webmvc/src/test/resources/log4j2-test.xml b/spring-webmvc/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..89477e94bac --- /dev/null +++ b/spring-webmvc/src/test/resources/log4j2-test.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/spring-websocket/src/test/resources/log4j.properties b/spring-websocket/src/test/resources/log4j.properties deleted file mode 100644 index d591efdb0a7..00000000000 --- a/spring-websocket/src/test/resources/log4j.properties +++ /dev/null @@ -1,14 +0,0 @@ -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%-5p] [%c] - %m%n - -log4j.appender.file=org.apache.log4j.FileAppender -log4j.appender.file.file=bin/spring-websocket.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n - -log4j.rootCategory=WARN, console, file - -log4j.logger.org.springframework.web=WARN -log4j.logger.org.springframework.web.socket=WARN -log4j.logger.org.springframework.messaging=WARN diff --git a/spring-websocket/src/test/resources/log4j2-test.xml b/spring-websocket/src/test/resources/log4j2-test.xml new file mode 100644 index 00000000000..d667a55cd1b --- /dev/null +++ b/spring-websocket/src/test/resources/log4j2-test.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + +