You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by sy...@apache.org on 2022/05/16 15:22:12 UTC
[zookeeper] branch branch-3.5 updated: ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
This is an automated email from the ASF dual-hosted git repository.
symat pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new c4f268326 ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
c4f268326 is described below
commit c4f26832693ef9d75cea50923ea5da3cfe772f37
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Sat Mar 26 23:09:42 2022 +0530
ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
- Drop Apache Log4j1
- Replace with https://reload4j.qos.ch/, that is 100% compatible (same package names, it is actually a fork)
- Remove logging implementation dependency from zookeeper server module (that is also used by clients)
Client applications that upgrade to 3.6.4 or 3.7.1 won't have surprises regarding Maven exclusions, they were used to exclude log4j1, this is no more needed, but even if they forget to drop that exclusion it will be harmless, and they will never find reload4j as transitive dependency
Author: Enrico Olivelli <eo...@apache.org>
Reviewers: Mate Szalay-Beko <sy...@apache.org>, Christopher Tubbs <ct...@apache.org>, Tamas Penzes <ta...@cloudera.com>, Mohammad Arshad <ar...@apache.org>
Closes #1802 from eolivelli/impl/reload4j and squashes the following commits:
54415368f [Enrico Olivelli] update reload4j to 1.2.19
f80c08948 [Enrico Olivelli] Move to slf4j-reload4j
0399bffe7 [Enrico Olivelli] Update SLF4J
0e99b8070 [Enrico Olivelli] add slf4j-log4j12 to the tarball
3d8ce939a [Enrico Olivelli] move slf4j impl to test scope
4be74c4f5 [Enrico Olivelli] Do not report reload4j as transitive dependency for dependant projects
9c6a12823 [Enrico Olivelli] add LICENSE stuff
3bbcd95d3 [Enrico Olivelli] Fix contrib rest
b27844f31 [Enrico Olivelli] fix build
f26533599 [Enrico Olivelli] fix loggraph
dbf29df20 [Enrico Olivelli] fix fatjar
37a55cc0f [Enrico Olivelli] fix contrib
e78792951 [Enrico Olivelli] ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
(cherry picked from commit efe333e7f8c1894d3c985cefcf1bf24d857c1b4e)
(cherry picked from commit 654dc5bc5dc7567722003b76f9338a9f594b2483)
---
pom.xml | 12 ++++++------
zookeeper-assembly/pom.xml | 8 ++++++++
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 12 +++---------
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 12 +++---------
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 14 ++++----------
zookeeper-server/pom.xml | 8 +++++---
zookeeper-server/src/main/resources/LICENSE.txt | 8 ++++++--
zookeeper-server/src/main/resources/NOTICE.txt | 6 +++---
...og4j-1.2.17.LICENSE.txt => reload4j.1.2.20.LICENSE.txt} | 0
.../{slf4j-1.7.25.LICENSE.txt => slf4j-1.7.36.LICENSE.txt} | 0
10 files changed, 38 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 33974f05f..60503732e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -290,10 +290,10 @@
<surefire-forkcount>8</surefire-forkcount>
<!-- dependency versions -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<audience-annotations.version>0.5.0</audience-annotations.version>
<junit.version>4.12</junit.version>
- <log4j.version>1.2.17</log4j.version>
+ <reload4j.version>1.2.20</reload4j.version>
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
@@ -387,7 +387,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
<exclusions>
<exclusion>
@@ -397,9 +397,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index b7bef05b5..b343925db 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -53,6 +53,14 @@
<artifactId>zookeeper</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper-client</artifactId>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 6215d02e5..69fad563a 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -59,14 +59,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index 8bf239fde..a882ac712 100755
--- a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -79,14 +79,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>asm</groupId>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 576d5a1e3..84a0afec6 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -59,15 +59,9 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 52ff46954..ee86bbc82 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -77,7 +77,8 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -115,8 +116,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.kerby</groupId>
diff --git a/zookeeper-server/src/main/resources/LICENSE.txt b/zookeeper-server/src/main/resources/LICENSE.txt
index b1264c0ec..287d96031 100644
--- a/zookeeper-server/src/main/resources/LICENSE.txt
+++ b/zookeeper-server/src/main/resources/LICENSE.txt
@@ -210,9 +210,13 @@ This distribution bundles jline 2.11, which is available under the
2-clause BSD License. For details, see a copy of the license in
lib/jline-2.11.LICENSE.txt
-This distribution bundles SLF4J 1.7.5, which is available under the MIT
+This distribution bundles SLF4J 1.7.36, which is available under the MIT
License. For details, see a copy of the license in
-lib/slf4j-1.7.5.LICENSE.txt
+lib/slf4j-1.7.36.LICENSE.txt
+
+This distribution bundles Reload4J 1.2.20, which is available under the
+Apache Software License, Version 2.0. For details, see a copy of the license in
+lib/reload4j-1.2.20.LICENSE.txt
This distribution bundles json-simple v1.1.1, which is available under the
Apache Software License, Version 2.0. For details, see a copy of the license in
diff --git a/zookeeper-server/src/main/resources/NOTICE.txt b/zookeeper-server/src/main/resources/NOTICE.txt
index 4b29aa7a3..a8170474b 100644
--- a/zookeeper-server/src/main/resources/NOTICE.txt
+++ b/zookeeper-server/src/main/resources/NOTICE.txt
@@ -75,13 +75,13 @@ framework, which can be obtained at:
* HOMEPAGE:
* http://commons.apache.org/logging/
-This product optionally depends on 'Apache Log4J', a logging framework,
+This product optionally depends on 'Reload4j', a logging framework,
which can be obtained at:
* LICENSE:
- * license/LICENSE.log4j.txt (Apache License 2.0)
+ * license/LICENSE.reload4j.txt (Apache License 2.0)
* HOMEPAGE:
- * http://logging.apache.org/log4j/
+ * https://reload4j.qos.ch/
This product optionally depends on 'JBoss Logging', a logging framework,
which can be obtained at:
diff --git a/zookeeper-server/src/main/resources/lib/log4j-1.2.17.LICENSE.txt b/zookeeper-server/src/main/resources/lib/reload4j.1.2.20.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/log4j-1.2.17.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/reload4j.1.2.20.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt b/zookeeper-server/src/main/resources/lib/slf4j-1.7.36.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/slf4j-1.7.25.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/slf4j-1.7.36.LICENSE.txt