You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pd...@apache.org on 2020/09/21 09:20:59 UTC
[zeppelin] branch master updated: [ZEPPELIN-5050] Remove
commons-logging and switch to slf4j and jcl-over-slf4j
This is an automated email from the ASF dual-hosted git repository.
pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 8b43c44 [ZEPPELIN-5050] Remove commons-logging and switch to slf4j and jcl-over-slf4j
8b43c44 is described below
commit 8b43c44dd755c1d270e76c536dd9681ac3fe81bd
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Tue Sep 15 16:01:51 2020 +0200
[ZEPPELIN-5050] Remove commons-logging and switch to slf4j and jcl-over-slf4j
### What is this PR for?
This PR removes logging implementations with scope compile in all Zeppelin libraries (interpreter).
jcl-over-slf4j is used as a bridge for commons-logging.
commons-logging is removed as a dependency.
### What type of PR is it?
- Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5050
### How should this be tested?
* Travis-CI: https://travis-ci.org/github/Reamer/zeppelin/builds/727960669
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Philipp Dallig <ph...@gmail.com>
Closes #3914 from Reamer/cleanup_loggging and squashes the following commits:
85f168106 [Philipp Dallig] Remove commons-logging and switch to slf4j and jcl-over-slf4j
---
cassandra/pom.xml | 15 ---------
flink/interpreter/pom.xml | 10 ------
flink/pom.xml | 10 ------
markdown/pom.xml | 7 +++++
pom.xml | 53 +++++++++++++++++++++++++++-----
spark/interpreter/pom.xml | 5 ---
spark/pom.xml | 10 ------
spark/spark-scala-parent/pom.xml | 9 ------
zeppelin-client-examples/pom.xml | 5 ---
zeppelin-client/pom.xml | 5 ---
zeppelin-common/pom.xml | 5 ---
zeppelin-display/pom.xml | 5 ---
zeppelin-integration/pom.xml | 4 ---
zeppelin-interpreter-parent/pom.xml | 15 ---------
zeppelin-interpreter-shaded/pom.xml | 3 +-
zeppelin-interpreter/pom.xml | 32 +++++++++++++++++--
zeppelin-plugins/notebookrepo/s3/pom.xml | 7 +++++
zeppelin-plugins/pom.xml | 5 +++
zeppelin-server/pom.xml | 25 +++++++++++++--
zeppelin-zengine/pom.xml | 10 ------
20 files changed, 118 insertions(+), 122 deletions(-)
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index cb89b04..4961048 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -125,21 +125,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<!-- test libraries -->
<dependency>
<groupId>org.scalatest</groupId>
diff --git a/flink/interpreter/pom.xml b/flink/interpreter/pom.xml
index bbfef74..df56a42 100644
--- a/flink/interpreter/pom.xml
+++ b/flink/interpreter/pom.xml
@@ -58,16 +58,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.zeppelin</groupId>
<artifactId>flink-shims</artifactId>
<version>${project.version}</version>
diff --git a/flink/pom.xml b/flink/pom.xml
index 7b9177f..abbb03d 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -54,16 +54,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/markdown/pom.xml b/markdown/pom.xml
index ca8a0a8..ceaa5c3 100644
--- a/markdown/pom.xml
+++ b/markdown/pom.xml
@@ -58,6 +58,13 @@
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
<version>${flexmark.all.version}</version>
+ <exclusions>
+ <!-- jcl-over-slf4j is provided by zeppelin-interprerter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 67db0e7..a78b7b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,6 @@
<commons.codec.version>1.14</commons.codec.version>
<commons.io.version>2.6</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>
- <commons.logging.version>1.1.1</commons.logging.version>
<commons.cli.version>1.4</commons.cli.version>
<shiro.version>1.4.2</shiro.version>
<joda.version>2.9.9</joda.version>
@@ -221,6 +220,13 @@
<version>${slf4j.version}</version>
</dependency>
+ <!-- Use jcl-over-slf4j instead of commons-logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -249,12 +255,26 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpcomponents.client.version}</version>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>${httpcomponents.asyncclient.version}</version>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -306,12 +326,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
-
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons.cli.version}</version>
@@ -480,6 +494,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -549,6 +568,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -623,6 +647,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -745,6 +774,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -855,6 +889,11 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
<!-- <exclusion>-->
<!-- <groupId>com.google.inject.extensions</groupId>-->
<!-- <artifactId>guice-servlet</artifactId>-->
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index a3de780..3c7f9f6 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -229,11 +229,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${spark.scala.version}</version>
diff --git a/spark/pom.xml b/spark/pom.xml
index 57de860..9dc600b 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -77,16 +77,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/spark/spark-scala-parent/pom.xml b/spark/spark-scala-parent/pom.xml
index d946d63..ff4f11e 100644
--- a/spark/spark-scala-parent/pom.xml
+++ b/spark/spark-scala-parent/pom.xml
@@ -114,15 +114,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
diff --git a/zeppelin-client-examples/pom.xml b/zeppelin-client-examples/pom.xml
index 8817635..a94e741 100644
--- a/zeppelin-client-examples/pom.xml
+++ b/zeppelin-client-examples/pom.xml
@@ -54,11 +54,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/zeppelin-client/pom.xml b/zeppelin-client/pom.xml
index 127309e..6f810c1 100644
--- a/zeppelin-client/pom.xml
+++ b/zeppelin-client/pom.xml
@@ -78,11 +78,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/zeppelin-common/pom.xml b/zeppelin-common/pom.xml
index 7f29cf3..3855746 100644
--- a/zeppelin-common/pom.xml
+++ b/zeppelin-common/pom.xml
@@ -52,11 +52,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/zeppelin-display/pom.xml b/zeppelin-display/pom.xml
index 9904c7b..28925ca 100644
--- a/zeppelin-display/pom.xml
+++ b/zeppelin-display/pom.xml
@@ -79,11 +79,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index d7e3f06..7beb821 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -108,10 +108,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
<!--test libraries-->
<dependency>
diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml
index 5d8fc0c..58d2d22 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -53,24 +53,9 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-exec</artifactId>
</dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/zeppelin-interpreter-shaded/pom.xml b/zeppelin-interpreter-shaded/pom.xml
index 1295b89..a6f4ddc 100644
--- a/zeppelin-interpreter-shaded/pom.xml
+++ b/zeppelin-interpreter-shaded/pom.xml
@@ -61,8 +61,7 @@
<!-- Leave slf4j unshaded so downstream users can configure logging. -->
<exclude>org.slf4j:slf4j-api</exclude>
<exclude>org.slf4j:slf4j-log4j12</exclude>
- <!-- Leave commons-logging unshaded so downstream users can configure logging. -->
- <exclude>commons-logging:commons-logging</exclude>
+ <exclude>org.slf4j:jcl-over-slf4j</exclude>
<!-- Leave log4j unshaded so downstream users can configure logging. -->
<exclude>log4j:log4j</exclude>
</excludes>
diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml
index 7894f01..736d8a8 100644
--- a/zeppelin-interpreter/pom.xml
+++ b/zeppelin-interpreter/pom.xml
@@ -99,6 +99,13 @@
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -114,6 +121,13 @@
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -129,12 +143,12 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<!-- Aether :: maven dependency resolution -->
@@ -231,6 +245,13 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -261,6 +282,13 @@
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId>
<version>${wagon.version}</version>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/zeppelin-plugins/notebookrepo/s3/pom.xml b/zeppelin-plugins/notebookrepo/s3/pom.xml
index 744840e..b61c1f3 100644
--- a/zeppelin-plugins/notebookrepo/s3/pom.xml
+++ b/zeppelin-plugins/notebookrepo/s3/pom.xml
@@ -45,6 +45,13 @@
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>${aws.sdk.s3.version}</version>
+ <exclusions>
+ <!-- jcl-over-slf4j is provided by zeppelin-interprerter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/zeppelin-plugins/pom.xml b/zeppelin-plugins/pom.xml
index 95bf383..7b1722d 100644
--- a/zeppelin-plugins/pom.xml
+++ b/zeppelin-plugins/pom.xml
@@ -67,6 +67,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <!-- jcl-over-slf4j is provided by zeppelin-interprerter -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 9fd635a..bb4719a 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -77,17 +77,29 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
@@ -177,6 +189,13 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
+ <exclusions>
+ <!-- using jcl-over-slf4j instead -->
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/zeppelin-zengine/pom.xml b/zeppelin-zengine/pom.xml
index a41add5..78ecc42 100644
--- a/zeppelin-zengine/pom.xml
+++ b/zeppelin-zengine/pom.xml
@@ -85,11 +85,6 @@
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
-
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -100,11 +95,6 @@
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>