From f61679b55f7825dac095f8963d9043c04100fa5e Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Mon, 27 Nov 2017 12:06:29 -0600 Subject: [PATCH] Added updates for properties files as well --- spring-batch-core-tests/src/main/resources/log4j.properties | 4 ++-- spring-batch-core-tests/src/test/resources/log4j.properties | 4 ++-- spring-batch-core/src/test/resources/log4j.properties | 4 ++-- .../src/test/resources/log4j.properties | 4 ++-- .../src/test/resources/log4j.properties | 4 ++-- spring-batch-integration/src/test/resources/log4j.properties | 4 ++-- spring-batch-samples/src/main/resources/log4j.properties | 4 ++-- spring-batch-test/src/test/resources/log4j.properties | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-batch-core-tests/src/main/resources/log4j.properties b/spring-batch-core-tests/src/main/resources/log4j.properties index f8c8855eb..ab37ea032 100644 --- a/spring-batch-core-tests/src/main/resources/log4j.properties +++ b/spring-batch-core-tests/src/main/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m%n log4j.category.org.apache.activemq=ERROR diff --git a/spring-batch-core-tests/src/test/resources/log4j.properties b/spring-batch-core-tests/src/test/resources/log4j.properties index 4f10f29e3..3bcb5f945 100644 --- a/spring-batch-core-tests/src/test/resources/log4j.properties +++ b/spring-batch-core-tests/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=WARN, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m%n log4j.category.org.apache.activemq=ERROR diff --git a/spring-batch-core/src/test/resources/log4j.properties b/spring-batch-core/src/test/resources/log4j.properties index 44dca7c68..f54d89e45 100644 --- a/spring-batch-core/src/test/resources/log4j.properties +++ b/spring-batch-core/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2}:%L - %m%n log4j.category.org.apache.activemq=ERROR diff --git a/spring-batch-infrastructure-tests/src/test/resources/log4j.properties b/spring-batch-infrastructure-tests/src/test/resources/log4j.properties index a12e7324c..da9add047 100644 --- a/spring-batch-infrastructure-tests/src/test/resources/log4j.properties +++ b/spring-batch-infrastructure-tests/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m%n log4j.category.org.apache.activemq=ERROR diff --git a/spring-batch-infrastructure/src/test/resources/log4j.properties b/spring-batch-infrastructure/src/test/resources/log4j.properties index 7168892cd..a53c07b34 100644 --- a/spring-batch-infrastructure/src/test/resources/log4j.properties +++ b/spring-batch-infrastructure/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %p %t [%c] - <%m>%n #log4j.category.org.springframework.batch=DEBUG diff --git a/spring-batch-integration/src/test/resources/log4j.properties b/spring-batch-integration/src/test/resources/log4j.properties index fc0e914ff..cbfa27779 100644 --- a/spring-batch-integration/src/test/resources/log4j.properties +++ b/spring-batch-integration/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=WARN, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p %t [%c] - <%m>%n log4j.category.org.springframework.context=INFO diff --git a/spring-batch-samples/src/main/resources/log4j.properties b/spring-batch-samples/src/main/resources/log4j.properties index b708a7b37..c5d035895 100644 --- a/spring-batch-samples/src/main/resources/log4j.properties +++ b/spring-batch-samples/src/main/resources/log4j.properties @@ -2,9 +2,9 @@ log4j.rootLogger=info, stdout # log4j.rootLogger=info, stdout, chainsaw ### direct log messages to stdout ### -log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m%n log4j.appender.chainsaw=org.apache.log4j.RollingFileAppender diff --git a/spring-batch-test/src/test/resources/log4j.properties b/spring-batch-test/src/test/resources/log4j.properties index 5e0f6839e..25230c0a1 100644 --- a/spring-batch-test/src/test/resources/log4j.properties +++ b/spring-batch-test/src/test/resources/log4j.properties @@ -1,7 +1,7 @@ log4j.rootCategory=INFO, stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout=org.apache.logging.log4j.core.appender.ConsoleAppender +log4j.appender.stdout.layout=org.apache.logging.log4j.core.layout.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{2} - %m%n log4j.category.org.apache.activemq=ERROR