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 20b28cc4ff567e269eb549f8d175af2973d1766b
Author: Damon P. Cortesi <[email protected]>
AuthorDate: Wed Apr 12 17:00:23 2023 -0700

    Add reload4j in some dependencies
---
 pom.xml                      | 10 ++++++++++
 scala-api/pom.xml            |  5 +++++
 thriftserver/session/pom.xml |  5 +++++
 3 files changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index 619ad700..2523b633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,6 +467,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -504,6 +508,12 @@
         <groupId>org.apache.spark</groupId>
         <artifactId>spark-sql_${scala.binary.version}</artifactId>
         <version>${spark.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
diff --git a/scala-api/pom.xml b/scala-api/pom.xml
index 4963dc70..0f45cab0 100644
--- a/scala-api/pom.xml
+++ b/scala-api/pom.xml
@@ -88,6 +88,11 @@
       <artifactId>spark-streaming_${scala.binary.version}</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-reload4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
 
diff --git a/thriftserver/session/pom.xml b/thriftserver/session/pom.xml
index 70710de5..535beab6 100644
--- a/thriftserver/session/pom.xml
+++ b/thriftserver/session/pom.xml
@@ -36,6 +36,11 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-reload4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>

Reply via email to