This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
commit 2f547a288ead1f9ce32481a8a4e07aacceae2c11
Author: Alex Rudyy <oru...@apache.org>
AuthorDate: Mon May 11 13:37:18 2020 +0100
QPIDJMS-503: Upgrade to log4j2
---
apache-qpid-jms/pom.xml | 4 +-
apache-qpid-jms/src/main/assembly/LICENSE | 2 +-
apache-qpid-jms/src/main/assembly/bin.xml | 4 +-
pom.xml | 13 ++-
qpid-jms-client/pom.xml | 4 +-
.../src/test/resources/log4j.properties | 45 ----------
.../src/test/resources/log4j2.properties | 79 ++++++++++++++++++
qpid-jms-discovery/pom.xml | 4 +-
qpid-jms-examples/pom.xml | 4 +-
.../{log4j.properties => log4j2.properties} | 20 +++--
.../qpid-jms-activemq-tests/pom.xml | 4 +-
.../src/test/resources/log4j.properties | 45 ----------
.../src/test/resources/log4j2.properties | 96 ++++++++++++++++++++++
13 files changed, 212 insertions(+), 112 deletions(-)
diff --git a/apache-qpid-jms/pom.xml b/apache-qpid-jms/pom.xml
index 7d6d0ae..6312350 100644
--- a/apache-qpid-jms/pom.xml
+++ b/apache-qpid-jms/pom.xml
@@ -36,8 +36,8 @@
<artifactId>qpid-jms-discovery</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/apache-qpid-jms/src/main/assembly/LICENSE
b/apache-qpid-jms/src/main/assembly/LICENSE
index 1c79982..7516811 100644
--- a/apache-qpid-jms/src/main/assembly/LICENSE
+++ b/apache-qpid-jms/src/main/assembly/LICENSE
@@ -207,7 +207,7 @@
# Third Party Dependency Licensing Information:
###############################################
-This product bundles SLF4J-API and SLF4J-LOG4J, which are distributed under
+This product bundles SLF4J-API which is distributed under
the MIT licence:
Copyright (c) 2004-2013 QOS.ch
diff --git a/apache-qpid-jms/src/main/assembly/bin.xml
b/apache-qpid-jms/src/main/assembly/bin.xml
index 50ae502..8ad805d 100644
--- a/apache-qpid-jms/src/main/assembly/bin.xml
+++ b/apache-qpid-jms/src/main/assembly/bin.xml
@@ -46,7 +46,7 @@
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<excludes>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
+ <exclude>org.apache.logging.log4j:log4j-slf4j-impl</exclude>
</excludes>
</dependencySet>
@@ -55,7 +55,7 @@
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
- <include>org.slf4j:slf4j-log4j12</include>
+ <include>org.apache.logging.log4j:log4j-slf4j-impl</include>
</includes>
</dependencySet>
</dependencySets>
diff --git a/pom.xml b/pom.xml
index 1175b01..80cce27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,7 @@
<proton-version>0.33.4</proton-version>
<netty-version>4.1.49.Final</netty-version>
<slf4j-version>1.7.30</slf4j-version>
+ <log4j-slf4j-version>2.13.2</log4j-slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
<!-- 'Provided'/Test Dependency Versions for this Project -->
@@ -186,9 +187,9 @@
</dependency>
<!-- Logging impl dependency, e.g for the tests or examples -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j-version}</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j-slf4j-version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -226,6 +227,12 @@
<artifactId>hadoop-minikdc</artifactId>
<version>${hadoop-minikdc-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/qpid-jms-client/pom.xml b/qpid-jms-client/pom.xml
index 4da6d3a..cd6db8f 100644
--- a/qpid-jms-client/pom.xml
+++ b/qpid-jms-client/pom.xml
@@ -103,8 +103,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/qpid-jms-client/src/test/resources/log4j.properties
b/qpid-jms-client/src/test/resources/log4j.properties
deleted file mode 100644
index cde6c04..0000000
--- a/qpid-jms-client/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=TRACE, out, stdout
-
-log4j.logger.org.apache.qpid.jms=DEBUG
-log4j.logger.org.apache.qpid.jms.provider=TRACE
-
-# calm down MinkKdc OpenDirectory
-log4j.logger.org.apache.directory=WARN
-log4j.logger.jdbm=WARN
-
-# Tune the TestPeer as needed for debugging.
-log4j.logger.org.apache.qpid.jms.test.testpeer=TRACE
-
-# 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
-log4j.appender.stdout.Threshold = TRACE
-log4j.appender.stdout.Target = System.out
-
-# 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
diff --git a/qpid-jms-client/src/test/resources/log4j2.properties
b/qpid-jms-client/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..cc3deac
--- /dev/null
+++ b/qpid-jms-client/src/test/resources/log4j2.properties
@@ -0,0 +1,79 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+
+name=TestPropertiesConfig
+status=warn
+
+filter.threshold.type=ThresholdFilter
+filter.threshold.level=trace
+
+appenders=console,file
+
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+appender.console.filter.threshold.type=ThresholdFilter
+appender.console.filter.threshold.level=trace
+
+appender.file.type=File
+appender.file.name=FILE
+appender.file.fileName=target/activemq-test.log
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+
+loggers=jms,provider,directory,jdbm,testpeer
+
+logger.jms.name=org.apache.qpid.jms
+logger.jms.level=debug
+logger.jms.additivity=false
+logger.jms.appenderRefs=console,file
+logger.jms.appenderRef.file.ref=FILE
+logger.jms.appenderRef.console.ref=STDOUT
+
+logger.provider.name=org.apache.qpid.jms.provider
+logger.provider.level=trace
+logger.provider.appenderRefs=console,file
+logger.provider.appenderRef.file.ref=FILE
+logger.provider.appenderRef.console.ref=STDOUT
+
+logger.directory.name=org.apache.directory
+logger.directory.level=warn
+logger.directory.appenderRefs=console,file
+logger.directory.appenderRef.file.ref=FILE
+logger.directory.appenderRef.console.ref=STDOUT
+
+logger.jdbm.name=jdbm
+logger.jdbm.level=warn
+logger.jdbm.appenderRefs=console,file
+logger.jdbm.appenderRef.file.ref=FILE
+logger.jdbm.appenderRef.console.ref=STDOUT
+
+logger.testpeer.name=org.apache.qpid.jms.test.testpeer
+logger.testpeer.level=trace
+logger.testpeer.appenderRefs=console,file
+logger.testpeer.appenderRef.file.ref=FILE
+logger.testpeer.appenderRef.console.ref=STDOUT
+
+rootLogger.level=trace
+rootLogger.appenderRefs=console,file
+rootLogger.appenderRef.console.ref=STDOUT
+rootLogger.appenderRef.file.ref=FILE
diff --git a/qpid-jms-discovery/pom.xml b/qpid-jms-discovery/pom.xml
index 7448c61..69b71af 100644
--- a/qpid-jms-discovery/pom.xml
+++ b/qpid-jms-discovery/pom.xml
@@ -53,8 +53,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index c3a7d81..52881fe 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -41,8 +41,8 @@
<!-- Provide a logging implementation to avoid
notice from SLF4J that none was found -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</dependency>
</dependencies>
diff --git a/qpid-jms-examples/src/main/resources/log4j.properties
b/qpid-jms-examples/src/main/resources/log4j2.properties
similarity index 63%
rename from qpid-jms-examples/src/main/resources/log4j.properties
rename to qpid-jms-examples/src/main/resources/log4j2.properties
index 8d88e29..c33a737 100644
--- a/qpid-jms-examples/src/main/resources/log4j.properties
+++ b/qpid-jms-examples/src/main/resources/log4j2.properties
@@ -17,11 +17,19 @@
# under the License.
#
-log4j.rootLogger=INFO, stdout
+name=ExamplesPropertiesConfig
+status=warn
-log4j.logger.org.apache.qpid.jms=WARN
+appender.console.type = Console
+appender.console.name = STDOUT
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+
+rootLogger.level = info
+rootLogger.appenderRef.stdout.ref = STDOUT
+
+logger.examples.name = org.apache.qpid.jms
+logger.examples.level = WARN
+logger.examples.additivity = false
+logger.examples.appenderRef.console.ref = STDOUT
-# CONSOLE appender
-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
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
index c437b36..cf9a7d4 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/pom.xml
@@ -67,8 +67,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties
deleted file mode 100644
index 9700646..0000000
---
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out, stdout
-
-log4j.logger.org.apache.qpid.jms=TRACE
-log4j.logger.org.apache.qpid.jms.provider=TRACE
-log4j.logger.org.apache.qpid.jms.provider.amqp=TRACE
-log4j.logger.org.apache.qpid.jms.provider.amqp.FRAMES=TRACE
-
-# Tune the ActiveMQ and it's AMQP transport as needed for debugging.
-log4j.logger.org.apache.activemq=INFO
-log4j.logger.org.apache.activemq.broker=INFO
-log4j.logger.org.apache.activemq.transport.ws=DEBUG
-log4j.logger.org.apache.activemq.transport.amqp=DEBUG
-log4j.logger.org.apache.activemq.transport.amqp.FRAMES=INFO
-
-# 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
diff --git
a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..f065359
--- /dev/null
+++
b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/resources/log4j2.properties
@@ -0,0 +1,96 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+#
+# The logging properties used during tests..
+#
+name=IntegrationTestPropertiesConfig
+status=warn
+
+appenders=console,file
+
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+
+appender.file.type=File
+appender.file.name=FILE
+appender.file.fileName=target/activemq-test.log
+appender.file.layout.type=PatternLayout
+appender.file.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+
+loggers=jms,provider,jmsamqp,jmsframes,activemq,broker,ws,amqp,frames
+
+logger.jms.name=org.apache.qpid.jms
+logger.jms.level=trace
+logger.jms.appenderRefs=console,file
+logger.jms.appenderRef.file.ref=FILE
+logger.jms.appenderRef.console.ref=STDOUT
+
+logger.provider.name=org.apache.qpid.jms.provider
+logger.provider.level=trace
+logger.provider.appenderRefs=console,file
+logger.provider.appenderRef.file.ref=FILE
+logger.provider.appenderRef.console.ref=STDOUT
+
+logger.jmsamqp.name=org.apache.qpid.jms.provider.amqp
+logger.jmsamqp.level=trace
+logger.jmsamqp.appenderRefs=console,file
+logger.jmsamqp.appenderRef.file.ref=FILE
+logger.jmsamqp.appenderRef.console.ref=STDOUT
+
+logger.jmsframes.name=org.apache.qpid.jms.provider.amqp.FRAMES
+logger.jmsframes.level=trace
+logger.jmsframes.appenderRefs=console,file
+logger.jmsframes.appenderRef.file.ref=FILE
+logger.jmsframes.appenderRef.console.ref=STDOUT
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=info
+logger.activemq.appenderRefs=console,file
+logger.activemq.appenderRef.file.ref=FILE
+logger.activemq.appenderRef.console.ref=STDOUT
+
+logger.broker.name=org.apache.activemq.broker
+logger.broker.level=info
+logger.broker.appenderRefs=console,file
+logger.broker.appenderRef.file.ref=FILE
+logger.broker.appenderRef.console.ref=STDOUT
+
+logger.ws.name=org.apache.activemq.transport.ws
+logger.ws.level=debug
+logger.ws.appenderRefs=console,file
+logger.ws.appenderRef.file.ref=FILE
+logger.ws.appenderRef.console.ref=STDOUT
+
+logger.amqp.name=org.apache.activemq.transport.amqp
+logger.amqp.level=debug
+logger.amqp.appenderRefs=console,file
+logger.amqp.appenderRef.file.ref=FILE
+logger.amqp.appenderRef.console.ref=STDOUT
+
+logger.frames.name=org.apache.activemq.transport.amqp.FRAMES
+logger.frames.level=info
+logger.frames.appenderRefs=console,file
+logger.frames.appenderRef.file.ref=FILE
+logger.frames.appenderRef.console.ref=STDOUT
+
+rootLogger.level=info
+rootLogger.appenderRefs=console,file
+rootLogger.appenderRef.console.ref=STDOUT
+rootLogger.appenderRef.file.ref=FILE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
