summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Olivelli <eolivelli@apache.org>2022-03-26 23:09:42 +0530
committerEnrico Olivelli <eolivelli@apache.org>2022-03-29 09:41:21 +0200
commit654dc5bc5dc7567722003b76f9338a9f594b2483 (patch)
treec8b4cd9f55dc3fc75f1c1ff747c9a8a93c457356
parentde872cda72c3d8760d2e06613cf38f222573f6a9 (diff)
downloadzookeeper-654dc5bc5dc7567722003b76f9338a9f594b2483.tar.gz
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 <eolivelli@apache.org> Reviewers: Mate Szalay-Beko <symat@apache.org>, Christopher Tubbs <ctubbsii@apache.org>, Tamas Penzes <tamaas@cloudera.com>, Mohammad Arshad <arshad@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)
-rwxr-xr-xpom.xml12
-rwxr-xr-xzookeeper-assembly/pom.xml8
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-fatjar/pom.xml6
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-loggraph/pom.xml14
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-rest/pom.xml14
-rwxr-xr-xzookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml17
-rwxr-xr-xzookeeper-server/pom.xml8
-rw-r--r--zookeeper-server/src/main/resources/NOTICE.txt6
-rw-r--r--zookeeper-server/src/main/resources/lib/reload4j.1.2.19.LICENSE.txt (renamed from zookeeper-server/src/main/resources/lib/log4j-1.2.17.LICENSE.txt)0
-rw-r--r--zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt22
10 files changed, 60 insertions, 47 deletions
diff --git a/pom.xml b/pom.xml
index 2606c6868..f2478c886 100755
--- a/pom.xml
+++ b/pom.xml
@@ -347,11 +347,11 @@
<surefire-forkcount>8</surefire-forkcount>
<!-- dependency versions -->
- <slf4j.version>1.7.25</slf4j.version>
+ <slf4j.version>1.7.35</slf4j.version>
<audience-annotations.version>0.5.0</audience-annotations.version>
<jmockit.version>1.48</jmockit.version>
<junit.version>4.12</junit.version>
- <log4j.version>1.2.17</log4j.version>
+ <reload4j.version>1.2.19</reload4j.version>
<mockito.version>2.27.0</mockito.version>
<hamcrest.version>1.3</hamcrest.version>
<commons-cli.version>1.2</commons-cli.version>
@@ -451,7 +451,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
<exclusions>
<exclusion>
@@ -461,9 +461,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 f9e2fc461..e23df6a2f 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 d6126dbcc..f54d8d3e9 100755
--- a/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-fatjar/pom.xml
@@ -95,9 +95,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 42d5dd68a..51fb7e2ea 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>
@@ -90,4 +84,4 @@
</resources>
</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 2888e055d..2c8237a20 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 dbb61cc8b..76767b4d7 100755
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -58,15 +58,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>
@@ -88,5 +82,4 @@
<artifactId>commons-collections</artifactId>
</dependency>
</dependencies>
-
-</project> \ No newline at end of file
+</project>
diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml
index f2e242cde..739b81657 100755
--- a/zookeeper-server/pom.xml
+++ b/zookeeper-server/pom.xml
@@ -81,7 +81,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>
@@ -124,8 +125,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 1b0fb951c..ff9fca39c 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
index 6279e5206..6279e5206 100644
--- 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
diff --git a/zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt b/zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt
new file mode 100644
index 000000000..a502dd93a
--- /dev/null
+++ b/zookeeper-server/src/main/resources/lib/slf4j-1.7.35.LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2004-2017 QOS.ch
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+