You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ar...@apache.org on 2022/03/26 17:41:26 UTC
[zookeeper] branch branch-3.7 updated: ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
This is an automated email from the ASF dual-hosted git repository.
arshad pushed a commit to branch branch-3.7
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.7 by this push:
new efe333e ZOOKEEPER-4455: Move to https://reload4j.qos.ch/ (remove log4j1)
efe333e is described below
commit efe333e7f8c1894d3c985cefcf1bf24d857c1b4e
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)
---
pom.xml | 12 ++++++------
zookeeper-assembly/pom.xml | 8 ++++++++
zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml | 6 +++---
zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml | 14 ++++----------
zookeeper-contrib/zookeeper-contrib-rest/pom.xml | 14 ++++----------
zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml | 16 +++++-----------
zookeeper-server/pom.xml | 8 +++++---
zookeeper-server/src/main/resources/NOTICE.txt | 6 +++---
...4j-1.2.17.LICENSE.txt => reload4j.1.2.19.LICENSE.txt} | 0
...slf4j-1.7.30.LICENSE.txt => slf4j-1.7.35.LICENSE.txt} | 0
10 files changed, 38 insertions(+), 46 deletions(-)
diff --git a/pom.xml b/pom.xml
index 084a106..3d50c4b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -428,12 +428,12 @@
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<!-- dependency versions -->
- <slf4j.version>1.7.30</slf4j.version>
+ <slf4j.version>1.7.35</slf4j.version>
<audience-annotations.version>0.12.0</audience-annotations.version>
<jmockit.version>1.48</jmockit.version>
<junit.version>5.6.2</junit.version>
<junit-platform.version>1.6.2</junit-platform.version>
- <log4j.version>1.2.17</log4j.version>
+ <reload4j.version>1.2.19</reload4j.version>
<mockito.version>3.6.28</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<commons-cli.version>1.4</commons-cli.version>
@@ -533,7 +533,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
<exclusions>
<exclusion>
@@ -543,9 +543,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>org.jmockit</groupId>
diff --git a/zookeeper-assembly/pom.xml b/zookeeper-assembly/pom.xml
index af39ef3..3730f61 100755
--- a/zookeeper-assembly/pom.xml
+++ b/zookeeper-assembly/pom.xml
@@ -64,6 +64,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-fatjar/pom.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
index 04c3ec5..bcac718 100755
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
@@ -91,9 +91,9 @@
<artifactId>snappy-java</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
index 779e8d9..7c6f654 100755
--- a/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-loggraph/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -63,14 +63,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>
@@ -134,4 +128,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-contrib/zookeeper-contrib-rest/pom.xml b/zookeeper-contrib/zookeeper-contrib-rest/pom.xml
index a4724fa..8e35086 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>
@@ -134,4 +128,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
index 1232522..162b2ee 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -99,15 +99,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>org.junit.vintage</groupId>
@@ -125,4 +119,4 @@
<version>${rat.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index 15cc82b..372cbe3 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -80,7 +80,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>
@@ -123,8 +124,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/NOTICE.txt b/zookeeper-server/src/main/resources/NOTICE.txt
index 1b0fb95..ff9fca3 100644
--- a/zookeeper-server/src/main/resources/NOTICE.txt
+++ b/zookeeper-server/src/main/resources/NOTICE.txt
@@ -81,13 +81,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.19.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.19.LICENSE.txt
diff --git a/zookeeper-server/src/main/resources/lib/slf4j-1.7.30.LICENSE.txt b/zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/slf4j-1.7.30.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt