From 9eb6e6d50021e4b780e29be467441fe789cf03c1 Mon Sep 17 00:00:00 2001
From: Hoo <18637171812@163.com>
Date: Fri, 27 Dec 2024 11:30:54 +0800
Subject: [PATCH 1/2] [CALCITE-6747] Multiple SLF4J bindings in Spark unit test

---
 spark/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spark/build.gradle.kts b/spark/build.gradle.kts
index 95e10100fa36..b1983443ac14 100644
--- a/spark/build.gradle.kts
+++ b/spark/build.gradle.kts
@@ -31,5 +31,5 @@ dependencies {
     runtimeOnly("xerces:xercesImpl")
 
     testImplementation(project(":testkit"))
-    testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
+    testRuntimeOnly("org.slf4j:slf4j-reload4j")
 }

From 536169900e04b14e1c0f7cb54bb9301ca854cb28 Mon Sep 17 00:00:00 2001
From: Hoo <18637171812@163.com>
Date: Fri, 27 Dec 2024 16:21:26 +0800
Subject: [PATCH 2/2] [CALCITE-6747] Multiple SLF4J bindings in Spark unit test

---
 spark/build.gradle.kts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spark/build.gradle.kts b/spark/build.gradle.kts
index b1983443ac14..b194e0fd5e60 100644
--- a/spark/build.gradle.kts
+++ b/spark/build.gradle.kts
@@ -20,6 +20,8 @@ dependencies {
     api("org.apache.spark:spark-core_2.10") {
         exclude("org.slf4j", "slf4j-log4j12")
                 .because("conflicts with log4j-slf4j-impl")
+        exclude("org.slf4j", "slf4j-reload4j")
+                .because("conflicts with log4j-slf4j-impl")
     }
 
     implementation("com.google.guava:guava")
@@ -31,5 +33,5 @@ dependencies {
     runtimeOnly("xerces:xercesImpl")
 
     testImplementation(project(":testkit"))
-    testRuntimeOnly("org.slf4j:slf4j-reload4j")
+    testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl")
 }