From 8fe16837dff56d0e578d3d4abed0070884bd58a7 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Wed, 1 Oct 2025 21:12:08 -0700
Subject: [PATCH] [SPARK-53783] Use `log4j2` instead of `log4j`

---
 build-tools/docs-utils/build.gradle | 2 +-
 gradle/libs.versions.toml           | 3 +--
 spark-operator-api/build.gradle     | 4 +---
 spark-operator/build.gradle         | 5 +----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/build-tools/docs-utils/build.gradle b/build-tools/docs-utils/build.gradle
index 5ce8e641..bf467e69 100644
--- a/build-tools/docs-utils/build.gradle
+++ b/build-tools/docs-utils/build.gradle
@@ -25,7 +25,7 @@ ext {
 dependencies {
     implementation project(":spark-operator")
     implementation(libs.log4j.core)
-    implementation(libs.log4j.slf4j.impl)
+    implementation(libs.log4j.slf4j2.impl)
     compileOnly(libs.lombok)
     annotationProcessor(libs.lombok)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0212b7af..4a1ade09 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -48,8 +48,7 @@ crd-generator-apt = { group = "io.fabric8", name = "crd-generator-apt", version.
 lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
 log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
 log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
-log4j-slf4j-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j-impl", version.ref = "log4j" }
-log4j-api12 = { group = "org.apache.logging.log4j", name = "log4j-1.2-api", version.ref = "log4j" }
+log4j-slf4j2-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" }
 log4j-layout-template-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json", version.ref = "log4j" }
 slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
 operator-framework = { group = "io.javaoperatorsdk", name = "operator-framework", version.ref = "operator-sdk"}
diff --git a/spark-operator-api/build.gradle b/spark-operator-api/build.gradle
index 9db7d566..edbe210e 100644
--- a/spark-operator-api/build.gradle
+++ b/spark-operator-api/build.gradle
@@ -27,9 +27,7 @@ dependencies {
   annotationProcessor(libs.lombok)
 
   // logging
-  implementation(libs.log4j.slf4j.impl) {
-    exclude group: 'org.slf4j'
-  }
+  implementation(libs.log4j.slf4j2.impl)
   implementation(libs.log4j.core)
   implementation(libs.slf4j.api)
 
diff --git a/spark-operator/build.gradle b/spark-operator/build.gradle
index a7ceb8f7..4b7e3640 100644
--- a/spark-operator/build.gradle
+++ b/spark-operator/build.gradle
@@ -31,10 +31,7 @@ dependencies {
   // logging
   implementation(libs.log4j.api)
   implementation(libs.log4j.core)
-  implementation(libs.log4j.slf4j.impl) {
-    exclude group: 'org.slf4j'
-  }
-  implementation(libs.log4j.api12)
+  implementation(libs.log4j.slf4j2.impl)
   implementation(libs.log4j.layout.template.json)
   implementation(libs.slf4j.api)