This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e949e63 Camel-ActiveMQ use log4j 2.x
e949e63 is described below
commit e949e63aea4cbd71476befdb3c94f97238a40ddd
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Feb 4 14:07:48 2019 +0100
Camel-ActiveMQ use log4j 2.x
---
components/camel-activemq/pom.xml | 26 +++++++++++--------
.../{log4j.properties => log4j2.properties} | 29 ++++++++--------------
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/components/camel-activemq/pom.xml
b/components/camel-activemq/pom.xml
index bfdd499..21fb0d1 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -166,17 +166,21 @@
<optional>true</optional>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <optional>true</optional>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/components/camel-activemq/src/test/resources/log4j.properties
b/components/camel-activemq/src/test/resources/log4j2.properties
similarity index 59%
rename from components/camel-activemq/src/test/resources/log4j.properties
rename to components/camel-activemq/src/test/resources/log4j2.properties
index 840bb66..40e2adb 100644
--- a/components/camel-activemq/src/test/resources/log4j.properties
+++ b/components/camel-activemq/src/test/resources/log4j2.properties
@@ -15,21 +15,14 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-#log4j.logger.org.apache.activemq=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1}
- %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
-log4j.appender.out.file=target/activemq-test.log
-log4j.appender.out.append=true
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-activemq-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = INFO
+rootLogger.appenderRef.file.ref = file
