[AMQ-7426] Upgrade to log4j2

activemq-all/pom.xml

@@ -60,12 +60,8 @@
       <artifactId>geronimo-annotation_1.0_spec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
   </dependencies>
 
@@ -109,9 +105,8 @@
                   <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
                   <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
                   <include>org.slf4j:slf4j-api</include>
-                  <include>org.slf4j:slf4j-log4j12</include>
+                  <include>org.apache.logging:log4j-slf4j-impl</include>
                   <include>org.slf4j:jcl-over-slf4j</include>
-                  <include>log4j:log4j</include>
                   <include>org.springframework:spring-core</include>
                   <include>org.springframework:spring-beans</include>
                   <include>org.springframework:spring-context</include>
@@ -347,15 +342,15 @@
           <optional>true</optional>
         </dependency>
         <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-          <version>${slf4j-version}</version>
+          <groupId>org.apache.logging</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+          <version>${log4j-version}</version>
           <classifier>sources</classifier>
           <optional>true</optional>
         </dependency>
         <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
+          <groupId>org.apache.logging</groupId>
+          <artifactId>log4j-api</artifactId>
           <version>${log4j-version}</version>
           <classifier>sources</classifier>
           <optional>true</optional>

activemq-all/src/main/resources/log4j.properties → activemq-all/src/main/resources/log4j2.properties

@@ -19,25 +19,42 @@
 # This file controls most of the logging in ActiveMQ which is mainly based around
 # the commons logging API.
 #
-log4j.rootLogger=INFO, console
-log4j.logger.org.apache.activemq.spring=WARN
-log4j.logger.org.apache.activemq.web.handler=WARN
-log4j.logger.org.springframework=WARN
-log4j.logger.org.apache.xbean=WARN
-log4j.logger.org.apache.camel=INFO
-log4j.logger.org.eclipse.jetty=WARN
+rootLogger.level=INFO
+rootLogger.appenderRef.console.ref=Console
+rootLogger.appenderRef.console.filter.threshold.type=ThresholdFilter
+rootLogger.appenderRef.console.filter.threshold.level=INFO
+
+logger.spring.name=org.apache.activemq.spring
+logger.spring.level=WARN
+
+logger.handler.name=org.apache.activemq.web.handler
+logger.handler.level=WARN
+
+logger.springframework.name=org.springframework
+logger.springframework.level=WARN
+
+logger.xbean.name=org.apache.xbean
+logger.xbean.level=WARN
+
+logger.camel.name=org.apache.camel
+logger.camel.level=INFO
+
+logger.jetty.name=org.eclipse.jetty
+logger.jetty.level=WARN
 
 # When debugging or reporting problems to the ActiveMQ team,
 # comment out the above lines and uncomment the next.
 
-#log4j.rootLogger=DEBUG, logfile, console
+#rootLogger.level=DEBUG
 
 # Or for more fine grained debug logging uncomment one of these
-#log4j.logger.org.apache.activemq=DEBUG
-#log4j.logger.org.apache.camel=DEBUG
+#logger.activemq.name=org.apache.activemq
+#logger.activemq.level=DEBUG
+#logger.camel.name=org.apache.camel
+#logger.camel.level=DEBUG
 
 # Console appender
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%5p | %m%n
-log4j.appender.console.threshold=INFO
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%5p | %m%n

activemq-amqp/pom.xml

@@ -130,8 +130,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>

activemq-amqp/src/test/resources/log4j2-test.properties

@@ -0,0 +1,74 @@
+#
+# 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
+#
+rootLogger.level=WARN
+
+rootLogger.appenderRef.console.ref=Console
+rootLogger.appenderRef.console.filter.threshold.type=ThresholdFilter
+rootLogger.appenderRef.console.filter.threshold.level=TRACE
+rootLogger.appenderRef.logfile.ref=RollingFile
+
+logger.activemq.name=org.apache.activemq
+logger.activemq.level=INFO
+
+logger.amqp.name=org.apache.activemq.transport.amqp
+logger.amqp.level=DEBUG
+
+logger.clientframes.name=org.apache.activemq.transport.amqp.client.FRAMES
+logger.clientframes.level=TRACE
+
+logger.frames.name=org.apache.activemq.transport.amqp.FRAMES
+logger.frames.level=TRACE
+
+logger.fusesource.name=org.fusesource
+logger.fusesource.level=INFO
+
+# Configure various level of detail for Qpid JMS logs.
+logger.qpid.name=org.apache.qpid.jms
+logger.qpid.level=INFO
+
+logger.qpidprovider.name=org.apache.qpid.jms.provider
+logger.qpidprovider.level=INFO
+
+logger.qpidamqp.name=org.apache.qpid.jms.provider.amqp
+logger.qpidamqp.level=INFO
+
+logger.qpidframes.name=org.apache.qpid.jms.provider.amqp.FRAMES
+logger.qpidframes.level=INFO
+
+# Appender configuration
+
+# Console appender
+appender.console.type=Console
+appender.console.name=Console
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d [%-15.15t] - %-5p %-25.30c{1} - %m%n
+
+# RollingFile appender
+appender.logfile.type=RollingRandomAccessFile
+appender.logfile.name=RollingFile
+appender.logfile.fileName=target/test.log
+appender.logfile.filePattern=target/test.log.%i
+appender.logfile.append=true
+appender.logfile.layout.type=PatternLayout
+appender.logfile.layout.pattern=%d [%-15.15t] - %-5p %-30.30c{1} - %m%n
+appender.logfile.policies.type=Policies
+appender.logfile.policies.size.type=SizeBasedTriggeringPolicy
+appender.logfile.policies.size.size=1MB

activemq-broker/pom.xml

@@ -83,8 +83,13 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <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>
     <dependency>
@@ -105,7 +110,6 @@
           <links>
             <link>${javase-javadoc-url}</link>
             <link>${javaee-javadoc-url}</link>
-            <link>${slf4j-javadoc-url}</link>
             <link>http://junit.sourceforge.net/javadoc/</link>
           </links>
           <stylesheetfile>${basedir}/../etc/css/stylesheet.css</stylesheetfile>

activemq-broker/src/test/java/org/apache/activemq/util/DefaultTestAppender.java

@@ -17,67 +17,72 @@
 
 package org.apache.activemq.util;
 
-import org.apache.log4j.Appender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.spi.ErrorHandler;
-import org.apache.log4j.spi.Filter;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.ErrorHandler;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
 
 public abstract class DefaultTestAppender implements Appender {
 
     String name = this.getClass().getSimpleName();
-
-    @Override
-    public void addFilter(Filter newFilter) {
 
+    @Override
+    public String getName() {
+        return name;
     }
 
     @Override
-    public Filter getFilter() {
+    public ErrorHandler getHandler() {
         return null;
     }
 
     @Override
-    public void clearFilters() {
+    public void setHandler(ErrorHandler handler) {
 
     }
 
     @Override
-    public void close() {
-
+    public Layout getLayout() {
+        return null;
     }
 
     @Override
-    public String getName() {
-        return name;
+    public void append(LogEvent event) {
+
     }
 
     @Override
-    public void setErrorHandler(ErrorHandler errorHandler) {
-
+    public boolean ignoreExceptions() {
+        return true;
     }
 
     @Override
-    public ErrorHandler getErrorHandler() {
+    public State getState() {
         return null;
     }
 
     @Override
-    public void setLayout(Layout layout) {
+    public void initialize() {
 
     }
 
     @Override
-    public Layout getLayout() {
-        return null;
+    public void start() {
+
     }
 
     @Override
-    public void setName(String name) {
-        this.name = name;
+    public void stop() {
+
+    }
+
+    @Override
+    public boolean isStarted() {
+        return false;
     }
 
     @Override
-    public boolean requiresLayout() {
+    public boolean isStopped() {
         return false;
     }
 }