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/04/13 00:04:12 UTC
[incubator-livy] 03/04: Swap slf4j-api with slf4j-reload4j
This is an automated email from the ASF dual-hosted git repository.
dacort pushed a commit to branch fix/log4j-reload4j-part2
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
commit 3c373ddadfcb477c0a4e5fcfa0dfc0caf4f04aa5
Author: Damon P. Cortesi <d....@gmail.com>
AuthorDate: Wed Apr 12 09:40:40 2023 -0700
Swap slf4j-api with slf4j-reload4j
---
client-common/pom.xml | 2 +-
core/pom.xml | 2 +-
pom.xml | 16 ++++++++++++----
repl/pom.xml | 2 +-
rsc/pom.xml | 8 +++++++-
server/pom.xml | 2 +-
thriftserver/server/pom.xml | 2 +-
7 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/client-common/pom.xml b/client-common/pom.xml
index ffc63b9a..ae56a6b1 100644
--- a/client-common/pom.xml
+++ b/client-common/pom.xml
@@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index fe0132d5..1c43689d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index ad759721..619ad700 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,8 @@
<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>
+ <slf4j.version>1.7.36</slf4j.version>
+ <reload4j.version>1.2.25</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>
@@ -355,6 +356,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -458,6 +463,10 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -636,11 +645,10 @@
<version>${asynchttpclient.version}</version>
</dependency>
- <!-- we need a version > 1.7.13 because of SLF4J-324 -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
+ <artifactId>slf4j-reload4j</artifactId>
+ <version>${slf4j.version}</version>
</dependency>
</dependencies>
diff --git a/repl/pom.xml b/repl/pom.xml
index 8fc3bdbd..5d0dd134 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/rsc/pom.xml b/rsc/pom.xml
index dab3f224..ea29aa67 100644
--- a/rsc/pom.xml
+++ b/rsc/pom.xml
@@ -115,10 +115,16 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>provided</scope>
+ <!-- <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions> -->
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/server/pom.xml b/server/pom.xml
index 2ef9ee1d..402370ea 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -217,7 +217,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
diff --git a/thriftserver/server/pom.xml b/thriftserver/server/pom.xml
index dccb59ff..06017a87 100644
--- a/thriftserver/server/pom.xml
+++ b/thriftserver/server/pom.xml
@@ -103,7 +103,7 @@
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <artifactId>slf4j-reload4j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>