This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
new 1f01a61 AMQ-8472 - Switch to reload4j for logging
new cade46f Merge pull request #754 from coheigea/AMQ-8472
1f01a61 is described below
commit 1f01a61426e1f783b0952bb4298c6aeeaa1e5011
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Fri Feb 4 14:31:25 2022 +0000
AMQ-8472 - Switch to reload4j for logging
---
activemq-all/pom.xml | 14 ++---
activemq-amqp/pom.xml | 2 +-
activemq-broker/pom.xml | 2 +-
activemq-camel/pom.xml | 8 +--
activemq-client/pom.xml | 2 +-
activemq-console/pom.xml | 7 +--
activemq-http/pom.xml | 2 +-
activemq-itests-spring31/pom.xml | 7 +--
activemq-jaas/pom.xml | 13 ++--
activemq-jdbc-store/pom.xml | 2 +-
activemq-jms-pool/pom.xml | 7 +--
activemq-kahadb-store/pom.xml | 7 +--
activemq-karaf-itest/pom.xml | 2 +-
activemq-karaf/pom.xml | 10 +---
activemq-leveldb-store/pom.xml | 15 +----
activemq-log4j-appender/pom.xml | 6 +-
activemq-mqtt/pom.xml | 7 +--
activemq-osgi/pom.xml | 8 +--
activemq-partition/pom.xml | 32 +++-------
activemq-pool/pom.xml | 7 +--
activemq-ra/pom.xml | 2 +-
activemq-rar/pom.xml | 6 +-
activemq-runtime-config/pom.xml | 7 +--
activemq-shiro/pom.xml | 7 +--
activemq-spring/pom.xml | 15 +----
activemq-stomp/pom.xml | 7 +--
.../activemq-perf-maven-plugin/pom.xml | 2 +-
activemq-unit-tests/pom.xml | 13 ++--
activemq-web-console/pom.xml | 6 +-
activemq-web-demo/pom.xml | 2 +-
activemq-web/pom.xml | 2 +-
assembly/pom.xml | 30 ++++------
assembly/src/main/descriptors/common-bin.xml | 4 +-
pom.xml | 69 ++++++++++++++++++++--
34 files changed, 139 insertions(+), 193 deletions(-)
diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index d62c173..7888380 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -119,9 +119,9 @@
<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.slf4j:slf4j-reload4j</include>
<include>org.slf4j:jcl-over-slf4j</include>
- <include>log4j:log4j</include>
+ <include>ch.qos.reload4j:reload4j</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include>
@@ -372,15 +372,15 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
index f121e19..1658ebf 100644
--- a/activemq-amqp/pom.xml
+++ b/activemq-amqp/pom.xml
@@ -136,7 +136,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 0eec783..b0305e2 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 9db9b79..c5d05fe 100644
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -186,13 +186,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <optional>true</optional>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
index 30ba753..3374638 100644
--- a/activemq-client/pom.xml
+++ b/activemq-client/pom.xml
@@ -96,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index b960b8d..138b7f9 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -105,12 +105,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml
index 0d4eb16..365c585 100644
--- a/activemq-http/pom.xml
+++ b/activemq-http/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-itests-spring31/pom.xml b/activemq-itests-spring31/pom.xml
index 7bdc7d2..d918c73 100644
--- a/activemq-itests-spring31/pom.xml
+++ b/activemq-itests-spring31/pom.xml
@@ -74,12 +74,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 7c40d11..2f1afdf 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -87,6 +87,12 @@
<artifactId>apacheds-server-integ</artifactId>
<version>${directory-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -100,17 +106,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml
index 49f7518..df57138 100644
--- a/activemq-jdbc-store/pom.xml
+++ b/activemq-jdbc-store/pom.xml
@@ -71,7 +71,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index 31a7148..7004f1f 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -102,12 +102,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 53eaeb1..8773935 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -132,12 +132,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index b6c2de9..e6d137c 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -134,7 +134,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 00b1885..53f17e7 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -42,18 +42,10 @@
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
- <version>1.11.4</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
- <version>1.11.4</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>apache-log4j-extras</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -62,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index f6158a8..c9e3d8e 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -123,14 +123,7 @@
<dependency>
<groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId>
- <version>${linkedin-zookeeper-version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.linkedin</groupId>
@@ -141,7 +134,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper-version}</version>
<scope>provided</scope>
</dependency>
@@ -282,12 +274,7 @@
<!-- Testing Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml
index 79d7052..6dee085 100644
--- a/activemq-log4j-appender/pom.xml
+++ b/activemq-log4j-appender/pom.xml
@@ -36,8 +36,8 @@
<artifactId>activemq-client</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
<scope>provided</scope>
</dependency>
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index bb0af50..ad70e00 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -158,12 +158,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 8656b41..152de5b 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -528,15 +528,15 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j-version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
diff --git a/activemq-partition/pom.xml b/activemq-partition/pom.xml
index e5f0635..2e4cdbf 100644
--- a/activemq-partition/pom.xml
+++ b/activemq-partition/pom.xml
@@ -52,13 +52,14 @@
<dependency>
<groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId>
- <version>${linkedin-zookeeper-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.linkedin</groupId>
@@ -68,13 +69,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper-version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- For Optional Snappy Compression -->
@@ -93,16 +87,6 @@
<!-- Testing Dependencies -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<type>test-jar</type>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 9dffad7..ea457038 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -96,12 +96,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index c9c3fe2..64613ef 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -76,7 +76,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 43f4359..e529674 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -340,12 +340,8 @@
<artifactId>activemq-mqtt</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml
index 138e58a..6cbeffc 100644
--- a/activemq-runtime-config/pom.xml
+++ b/activemq-runtime-config/pom.xml
@@ -79,12 +79,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml
index 373e7a8..eb50ccb 100644
--- a/activemq-shiro/pom.xml
+++ b/activemq-shiro/pom.xml
@@ -95,12 +95,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 9774b0b..132e3e9 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -90,14 +90,7 @@
<dependency>
<groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId>
- <version>${linkedin-zookeeper-version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.linkedin</groupId>
@@ -108,7 +101,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper-version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -183,11 +175,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
<version>2.2</version>
@@ -195,7 +182,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 1753337..e8df216 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -91,12 +91,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
index 54b8132..0edbb09 100644
--- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml
+++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml
@@ -78,7 +78,7 @@
</dependency>
<!-- dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency -->
</dependencies>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 01962d5..47b77ce 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -188,12 +188,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -281,6 +276,12 @@
<artifactId>apacheds-server-integ</artifactId>
<version>${directory-version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 0d4197a..00018d8 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -263,11 +263,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<!-- JSTL support -->
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index 79cf159..449e7b5 100644
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -186,7 +186,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index e064ef4..ad25e27 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -130,7 +130,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index cf8dcd2..6737b7f 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -83,13 +83,6 @@
<dependency>
<groupId>org.linkedin</groupId>
<artifactId>org.linkedin.zookeeper-impl</artifactId>
- <version>${linkedin-zookeeper-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.linkedin</groupId>
@@ -99,13 +92,6 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper-version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -258,8 +244,8 @@
<artifactId>xpp3</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -371,7 +357,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -444,6 +430,16 @@
<groupId>io.fabric8.insight</groupId>
<artifactId>insight-log4j</artifactId>
<version>${insight-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml
b/assembly/src/main/descriptors/common-bin.xml
index 06f578f..9651d1d 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -193,8 +193,8 @@
<include>commons-codec:commons-codec</include>
<include>commons-net:commons-net</include>
<include>org.apache.commons:commons-lang3</include>
- <include>org.slf4j:slf4j-log4j12</include>
- <include>log4j:log4j</include>
+ <include>org.slf4j:slf4j-reload4j</include>
+ <include>ch.qos.reload4j:reload4j</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.httpcomponents:httpclient</include>
<include>org.apache.httpcomponents:httpcore</include>
diff --git a/pom.xml b/pom.xml
index 361b957..b2ae455 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,9 +87,9 @@
<leveldb-api-version>0.9</leveldb-api-version>
<leveldb-version>0.9</leveldb-version>
<leveldbjni-version>1.8</leveldbjni-version>
- <log4j-version>1.2.17</log4j-version>
<mockito-version>3.8.0</mockito-version>
<owasp-dependency-check-version>5.2.4</owasp-dependency-check-version>
+ <pax-logging-version>1.11.14</pax-logging-version>
<mqtt-client-version>1.16</mqtt-client-version>
<org-apache-derby-version>10.14.2.0</org-apache-derby-version>
<osgi-version>6.0.0</osgi-version>
@@ -99,6 +99,7 @@
<qpid-jms-version>0.58.0</qpid-jms-version>
<qpid-jms-netty-version>4.1.63.Final</qpid-jms-netty-version>
<qpid-jms-proton-version>0.33.8</qpid-jms-proton-version>
+ <reload4j-version>1.2.19</reload4j-version>
<netty-all-version>4.1.63.Final</netty-all-version>
<regexp-version>1.3</regexp-version>
<rome-version>1.16.0</rome-version>
@@ -106,7 +107,7 @@
<scala-version>2.11.11</scala-version>
<shiro-version>1.8.0</shiro-version>
<scalatest-version>3.0.8</scalatest-version>
- <slf4j-version>1.7.32</slf4j-version>
+ <slf4j-version>1.7.36</slf4j-version>
<snappy-version>1.1.2</snappy-version>
<spring-version>4.3.30.RELEASE</spring-version>
<taglibs-version>1.2.5</taglibs-version>
@@ -488,6 +489,28 @@
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <version>${pax-logging-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <version>${pax-logging-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>apache-log4j-extras</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-log4j2</artifactId>
+ <version>${pax-logging-version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>1.1.1</version>
@@ -597,6 +620,40 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>${zookeeper-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.linkedin</groupId>
+ <artifactId>org.linkedin.zookeeper-impl</artifactId>
+ <version>${linkedin-zookeeper-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- zeroconf transport -->
<dependency>
@@ -660,9 +717,9 @@
<!-- Used to configure the activemq logs -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j-version}</version>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j-version}</version>
<scope>runtime</scope>
</dependency>
@@ -1006,7 +1063,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j-version}</version>
</dependency>
<dependency>
