You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by da...@apache.org on 2023/03/13 22:25:01 UTC
[incubator-livy] 01/01: initial attempt at reload4j and excluding transitive dependencies
This is an automated email from the ASF dual-hosted git repository.
dacort pushed a commit to branch fix/log4j-reload4j
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
commit 92693774f204d8cbb31a46de44bf1e712e250465
Author: Damon P. Cortesi <d....@gmail.com>
AuthorDate: Mon Mar 13 15:24:53 2023 -0700
initial attempt at reload4j and excluding transitive dependencies
---
core/pom.xml | 4 ++--
integration-test/pom.xml | 6 +++++
pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++---
repl/pom.xml | 4 ++--
rsc/pom.xml | 4 ++--
server/pom.xml | 12 ++++++++++
6 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 5db4cc8f..fe0132d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -38,8 +38,8 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
</dependency>
<dependency>
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index f8f67f95..d80dd041 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -205,6 +205,12 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 18618426..32bee31e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
<asynchttpclient.version>2.10.1</asynchttpclient.version>
<hadoop.version>2.7.3</hadoop.version>
<hadoop.scope>compile</hadoop.scope>
+ <reload4j.version>1.2.24</reload4j.version>
<spark.scala-2.11.version>2.4.5</spark.scala-2.11.version>
<spark.scala-2.12.version>2.4.5</spark.scala-2.12.version>
<spark.version>${spark.scala-2.11.version}</spark.version>
@@ -264,9 +265,9 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
+ <version>${reload4j.version}</version>
</dependency>
<dependency>
@@ -333,6 +334,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -344,6 +351,10 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -352,12 +363,24 @@
<artifactId>hadoop-common</artifactId>
<classifier>tests</classifier>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -365,6 +388,12 @@
<artifactId>hadoop-hdfs</artifactId>
<classifier>tests</classifier>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -377,6 +406,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-client</artifactId>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -390,6 +425,12 @@
<artifactId>hadoop-yarn-server-tests</artifactId>
<classifier>tests</classifier>
<version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -413,6 +454,10 @@
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -420,6 +465,12 @@
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive_${scala.binary.version}</artifactId>
<version>${spark.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>apache-log4j-extras</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/repl/pom.xml b/repl/pom.xml
index dec6b092..8fc3bdbd 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -84,8 +84,8 @@
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/rsc/pom.xml b/rsc/pom.xml
index 01a82805..dab3f224 100644
--- a/rsc/pom.xml
+++ b/rsc/pom.xml
@@ -87,8 +87,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>ch.qos.reload4j</groupId>
+ <artifactId>reload4j</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/server/pom.xml b/server/pom.xml
index 188158b0..bbc642e5 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -149,6 +149,12 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -268,6 +274,12 @@
<artifactId>apacheds-core</artifactId>
<version>${apacheds.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>