This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch branch-0.11
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
commit e465b7d816fb5f17b3dff2c30713ce5e4aa5eefc
Author: PJ Fanning <pjfann...@users.noreply.github.com>
AuthorDate: Sun Mar 10 23:52:26 2024 +0100
[NO-ISSUE] Use reload4j instead of log4j (#4719)
(cherry picked from commit d0a71c7049bc60980d5e4b4398504916b834bf0e)
---
flink/flink-scala-2.12/pom.xml | 6 ++++
pom.xml | 40 +++++++++++++++++-----
rlang/pom.xml | 12 +++++++
shell/pom.xml | 4 +++
submarine/pom.xml | 8 +++++
zeppelin-distribution/src/bin_license/LICENSE | 5 +--
zeppelin-examples/zeppelin-example-clock/pom.xml | 7 +++-
.../zeppelin-example-horizontalbar/pom.xml | 7 +++-
.../zeppelin-example-spell-echo/pom.xml | 7 +++-
.../zeppelin-example-spell-flowchart/pom.xml | 7 +++-
.../zeppelin-example-spell-markdown/pom.xml | 7 +++-
.../zeppelin-example-spell-translator/pom.xml | 7 +++-
zeppelin-interpreter-parent/pom.xml | 7 +++-
zeppelin-interpreter-shaded/pom.xml | 5 ++-
zeppelin-interpreter/pom.xml | 23 ++++++++++++-
zeppelin-jupyter-interpreter-shaded/pom.xml | 6 ++++
zeppelin-server/pom.xml | 10 +++++-
zeppelin-zengine/pom.xml | 6 ++++
18 files changed, 151 insertions(+), 23 deletions(-)
diff --git a/flink/flink-scala-2.12/pom.xml b/flink/flink-scala-2.12/pom.xml
index d878cb6076..4587d8f0e4 100644
--- a/flink/flink-scala-2.12/pom.xml
+++ b/flink/flink-scala-2.12/pom.xml
@@ -295,6 +295,12 @@
<artifactId>hadoop-common</artifactId>
<version>${flink.hadoop.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 8d3e4147e8..65bf19dea1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,8 +114,8 @@
<plugin.frontend.version>1.12.1</plugin.frontend.version>
<!-- common library versions -->
- <slf4j.version>1.7.30</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
+ <slf4j.version>1.7.35</slf4j.version>
+ <reload4j.version>1.2.25</reload4j.version>
<libthrift.version>0.13.0</libthrift.version>
<flexmark.all.version>0.62.2</flexmark.all.version>
<gson.version>2.8.9</gson.version>
@@ -230,8 +230,20 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j.version}</version>
</dependency>
<!-- Use jcl-over-slf4j instead of commons-logging -->
@@ -241,12 +253,6 @@
<version>${slf4j.version}</version>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
@@ -650,6 +656,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1118,6 +1128,14 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
@@ -1340,6 +1358,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/rlang/pom.xml b/rlang/pom.xml
index dc4cf8b7de..30ad5db37e 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -90,6 +90,11 @@
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@@ -126,6 +131,12 @@
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -206,6 +217,7 @@
<artifactSet>
<excludes>
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<outputFile>${project.build.directory}/../../interpreter/r/${interpreter.jar.name}-${project.version}.jar</outputFile>
diff --git a/shell/pom.xml b/shell/pom.xml
index b3fbc31271..1c3dccc73b 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -83,6 +83,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/submarine/pom.xml b/submarine/pom.xml
index 0f278a2a62..600d4cc6c4 100644
--- a/submarine/pom.xml
+++ b/submarine/pom.xml
@@ -106,6 +106,14 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/zeppelin-distribution/src/bin_license/LICENSE
b/zeppelin-distribution/src/bin_license/LICENSE
index 22dc853f06..3fed5e7b54 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -226,6 +226,7 @@ The following components are provided under Apache License.
(Apache 2.0) Dropwizard Jackson Integration for Metrics
(io.dropwizard.metrics:metrics-json:4.1.14) -
https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE
(Apache 2.0) Dropwizard Metrics Health Checks
(io.dropwizard.metrics:metrics-healthchecks:4.1.14) -
https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE
(Apache 2.0) Dropwizard Metrics Integration with JMX
(io.dropwizard.metrics:metrics-jmx:4.1.14) -
https://github.com/dropwizard/metrics/blob/release/4.1.x/LICENSE
+ (Apache 2.0) reload4j v1.2.25 (ch.qos.reload4j:reload4j:jar:1.2.25 -
https://reload4j.qos.ch/) -
https://github.com/qos-ch/reload4j/blob/master/LICENSE
========================================================================
MIT licenses
@@ -257,9 +258,9 @@ The text of each license is also included at
licenses/LICENSE-[project]-[version
(The MIT License) moment-duration-format v1.3.0
(https://github.com/jsmreese/moment-duration-format) -
https://github.com/jsmreese/moment-duration-format/blob/1.3.0/LICENSE
(The MIT License) angular-ui-grid v4.0.4
(https://github.com/angular-ui/ui-grid) -
https://github.com/angular-ui/ui-grid/blob/v4.0.4/LICENSE.md
(The MIT License) Pikaday v1.3.2 (https://github.com/dbushell/Pikaday) -
https://github.com/dbushell/Pikaday/blob/1.3.2/LICENSE
- (The MIT License) slf4j v1.7.10 (org.slf4j:slf4j-api:jar:1.7.10 -
http://www.slf4j.org) - http://www.slf4j.org/license.html
+ (The MIT License) slf4j v1.7.35 (org.slf4j:slf4j-api:jar:1.7.35 -
http://www.slf4j.org) - http://www.slf4j.org/license.html
(The MIT License) slf4j v1.7.21 (org.slf4j:slf4j-simple:1.7.21 -
http://www.slf4j.org) - http://www.slf4j.org/license.html
- (The MIT License) slf4j-log4j12 v1.7.10
(org.slf4j:slf4j-log4j12:jar:1.7.10 - http://www.slf4j.org) -
http://www.slf4j.org/license.html
+ (The MIT License) slf4j-reload4j v1.7.35
(org.slf4j:slf4j-reload4j:jar:1.7.35 - http://www.slf4j.org) -
http://www.slf4j.org/license.html
(The MIT License) bcprov-jdk15on v1.70
(org.bouncycastle:bcprov-jdk15on:jar:1.70 -
http://www.bouncycastle.org/java.html) -
http://www.bouncycastle.org/licence.html
(The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) -
https://github.com/bryanbraun/anchorjs/blob/master/README.md#license
(The MIT License) moment-duration-format v1.3.0
(https://github.com/jsmreese/moment-duration-format) -
https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE
diff --git a/zeppelin-examples/zeppelin-example-clock/pom.xml
b/zeppelin-examples/zeppelin-example-clock/pom.xml
index b4a207421e..59a5942211 100644
--- a/zeppelin-examples/zeppelin-example-clock/pom.xml
+++ b/zeppelin-examples/zeppelin-example-clock/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
b/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
index 7a193ed0c2..d611aeac5d 100644
--- a/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
+++ b/zeppelin-examples/zeppelin-example-horizontalbar/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-examples/zeppelin-example-spell-echo/pom.xml
b/zeppelin-examples/zeppelin-example-spell-echo/pom.xml
index 07de931487..5d73b3ccc0 100644
--- a/zeppelin-examples/zeppelin-example-spell-echo/pom.xml
+++ b/zeppelin-examples/zeppelin-example-spell-echo/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml
b/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml
index 3345a53f41..6ddb26ac3e 100644
--- a/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml
+++ b/zeppelin-examples/zeppelin-example-spell-flowchart/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml
b/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml
index d51761d7be..78d5d5123b 100644
--- a/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml
+++ b/zeppelin-examples/zeppelin-example-spell-markdown/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-examples/zeppelin-example-spell-translator/pom.xml
b/zeppelin-examples/zeppelin-example-spell-translator/pom.xml
index 9e4ae323d8..06867140cd 100644
--- a/zeppelin-examples/zeppelin-example-spell-translator/pom.xml
+++ b/zeppelin-examples/zeppelin-example-spell-translator/pom.xml
@@ -52,7 +52,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-interpreter-parent/pom.xml
b/zeppelin-interpreter-parent/pom.xml
index 510b1bf74e..3b029e9745 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -62,7 +62,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/zeppelin-interpreter-shaded/pom.xml
b/zeppelin-interpreter-shaded/pom.xml
index 99e1f9ad87..5cc5092954 100644
--- a/zeppelin-interpreter-shaded/pom.xml
+++ b/zeppelin-interpreter-shaded/pom.xml
@@ -54,11 +54,10 @@
<artifactSet>
<excludes>
<!-- Leave slf4j unshaded so downstream users can configure
logging. -->
- <exclude>org.slf4j:slf4j-api</exclude>
- <exclude>org.slf4j:slf4j-log4j12</exclude>
- <exclude>org.slf4j:jcl-over-slf4j</exclude>
+ <exclude>org.slf4j:*</exclude>
<!-- Leave log4j unshaded so downstream users can configure
logging. -->
<exclude>log4j:log4j</exclude>
+ <exclude>ch.qos.reload4j:reload4j</exclude>
</excludes>
</artifactSet>
<filters>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index baace25c90..6ac2e2b9a7 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -138,7 +138,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
@@ -264,11 +269,27 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml
b/zeppelin-jupyter-interpreter-shaded/pom.xml
index dde735a5df..891819d9fd 100644
--- a/zeppelin-jupyter-interpreter-shaded/pom.xml
+++ b/zeppelin-jupyter-interpreter-shaded/pom.xml
@@ -66,6 +66,11 @@
<version>${google.errorprone.version}</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ </dependency>
+
</dependencies>
<build>
@@ -100,6 +105,7 @@
<artifactSet>
<excludes>
<exclude>org.apache.zeppelin:zeppelin-interpreter-shaded</exclude>
+ <exclude>log4j:log4j</exclude>
</excludes>
</artifactSet>
<relocations>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 45f13ed29a..79745b306f 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -88,6 +88,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
@@ -102,7 +106,11 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index 6dd55fc117..93bf11c666 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -321,6 +321,12 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
