From 5a7bd7c75834388669076de8aff28c1e727885d5 Mon Sep 17 00:00:00 2001
From: "woosuk.ro" <woosuk.ro@toss.im>
Date: Fri, 16 Feb 2024 18:05:58 +0900
Subject: [PATCH] [HDFS-17382] Add Apache Log4j Extras Library to Hadoop 3.3
 for Enhanced Log Rolling Capabilities

---
 .../hadoop-client-minicluster/pom.xml                 |  5 +++++
 hadoop-hdfs-project/hadoop-hdfs/pom.xml               | 11 +++++++++++
 hadoop-project/pom.xml                                |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 49a1c86b2452dd..d52a6e01fc193a 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -336,6 +336,11 @@
           <groupId>org.apache.hadoop.thirdparty</groupId>
           <artifactId>hadoop-shaded-guava</artifactId>
         </exclusion>
+        <exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>apache-log4j-extras</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- Add optional runtime dependency on the in-development timeline server module
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index c22238001086fc..e1d3414fff8919 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -35,6 +35,17 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>apache-log4j-extras</artifactId>
+      <version>${log4j-extras.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-auth</artifactId>
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index aede7601adcfaf..f0d8da6dce5404 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -82,7 +82,8 @@
     <!-- SLF4J/LOG4J version -->
     <slf4j.version>1.7.36</slf4j.version>
     <reload4j.version>1.2.22</reload4j.version>
-
+    <log4j-extras.version>1.2.17</log4j-extras.version>
+    
     <!-- com.google.re2j version -->
     <re2j.version>1.1</re2j.version>