From bed30b153b83f1ad1b400bab9ca303457d214a80 Mon Sep 17 00:00:00 2001
From: Andrew Purtell <apurtell@apache.org>
Date: Fri, 4 Mar 2022 12:12:20 -0800
Subject: [PATCH] Amend HBASE-26691 Replacing log4j with reload4j for
 branch-2.x

- Update reload4j version to 1.2.19
- Update shading and assembly configurations

Signed-off-by: Andrew Purtell <apurtell@apache.org>
---
 hbase-assembly/src/main/assembly/client.xml                 | 6 ++++--
 hbase-assembly/src/main/assembly/hadoop-three-compat.xml    | 6 ++++--
 hbase-assembly/src/main/assembly/hadoop-two-compat.xml      | 6 ++++--
 hbase-protocol-shaded/pom.xml                               | 1 +
 hbase-shaded/hbase-shaded-check-invariants/pom.xml          | 1 +
 hbase-shaded/hbase-shaded-testing-util/pom.xml              | 1 +
 .../hbase-shaded-with-hadoop-check-invariants/pom.xml       | 1 +
 pom.xml                                                     | 2 +-
 8 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml
index 48940b75d5b..41aeea577eb 100644
--- a/hbase-assembly/src/main/assembly/client.xml
+++ b/hbase-assembly/src/main/assembly/client.xml
@@ -55,6 +55,7 @@
               <exclude>com.github.stephenc.findbugs:findbugs-annotations</exclude>
               <exclude>commons-logging:commons-logging</exclude>
               <exclude>log4j:log4j</exclude>
+              <exclude>ch.qos.reload4j:reload4j</exclude>
               <exclude>org.apache.hbase:hbase-shaded-client</exclude>
               <exclude>org.apache.hbase:hbase-shaded-client-byo-hadoop</exclude>
               <exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude>
@@ -65,6 +66,7 @@
               <exclude>org.slf4j:jcl-over-slf4j</exclude>
               <exclude>org.slf4j:jul-to-slf4j</exclude>
               <exclude>org.slf4j:slf4j-log4j12</exclude>
+              <exclude>org.slf4j:slf4j-reload4j</exclude>
               <exclude>io.opentelemetry.javaagent:*</exclude>
             </excludes>
           </dependencySet>
@@ -146,14 +148,14 @@
       <includes>
         <include>com.github.stephenc.findbugs:findbugs-annotations</include>
         <include>commons-logging:commons-logging</include>
-        <include>log4j:log4j</include>
+        <include>ch.qos.reload4j:reload4j</include>
         <include>org.apache.htrace:htrace-core4</include>
         <include>org.apache.htrace:htrace-core</include>
         <include>org.apache.yetus:audience-annotations</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:jcl-over-slf4j</include>
         <include>org.slf4j:jul-to-slf4j</include>
-        <include>org.slf4j:slf4j-log4j12</include>
+        <include>org.slf4j:slf4j-reload4j</include>
         <include>io.opentelemetry:*</include>
       </includes>
     </dependencySet>
diff --git a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
index 6c670a77f7e..d24f5822427 100644
--- a/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-three-compat.xml
@@ -107,11 +107,13 @@
               <exclude>com.github.stephenc.findbugs:findbugs-annotations</exclude>
               <exclude>commons-logging:commons-logging</exclude>
               <exclude>log4j:log4j</exclude>
+              <exclude>ch.qos.reload4j:reload4j</exclude>
               <exclude>org.apache.htrace:htrace-core4</exclude>
               <exclude>org.apache.htrace:htrace-core</exclude>
               <exclude>org.apache.yetus:audience-annotations</exclude>
               <exclude>org.slf4j:slf4j-api</exclude>
               <exclude>org.slf4j:slf4j-log4j12</exclude>
+              <exclude>org.slf4j:slf4j-reload4j</exclude>
               <exclude>io.opentelemetry.javaagent:*</exclude>
             </excludes>
           </dependencySet>
@@ -205,14 +207,14 @@
       <includes>
         <include>com.github.stephenc.findbugs:findbugs-annotations</include>
         <include>commons-logging:commons-logging</include>
-        <include>log4j:log4j</include>
+        <include>ch.qos.reload4j:reload4j</include>
         <include>org.apache.htrace:htrace-core4</include>
         <include>org.apache.htrace:htrace-core</include>
         <include>org.apache.yetus:audience-annotations</include>
         <include>org.slf4j:slf4j-api</include>
         <include>org.slf4j:jcl-over-slf4j</include>
         <include>org.slf4j:jul-to-slf4j</include>
-        <include>org.slf4j:slf4j-log4j12</include>
+        <include>org.slf4j:slf4j-reload4j</include>
         <include>io.opentelemetry:*</include>
       </includes>
     </dependencySet>
diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
index 750027812e0..88aa9dc6cbb 100644
--- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml
@@ -104,6 +104,7 @@
               <exclude>commons-logging:commons-logging</exclude>
               <exclude>jline:jline</exclude>
               <exclude>log4j:log4j</exclude>
+              <exclude>ch.qos.reload4j:reload4j</exclude>
               <exclude>org.apache.hbase:hbase-shaded-client-byo-hadoop</exclude>
               <exclude>org.apache.hbase:hbase-shaded-client</exclude>
               <exclude>org.apache.hbase:hbase-shaded-mapreduce</exclude>
@@ -113,6 +114,7 @@
               <exclude>org.jruby:jruby-complete</exclude>
               <exclude>org.slf4j:slf4j-api</exclude>
               <exclude>org.slf4j:slf4j-log4j12</exclude>
+              <exclude>org.slf4j:slf4j-reload4j</exclude>
             </excludes>
           </dependencySet>
         </dependencySets>
@@ -205,12 +207,12 @@
       <includes>
         <include>com.github.stephenc.findbugs:findbugs-annotations</include>
         <include>commons-logging:commons-logging</include>
-        <include>log4j:log4j</include>
+        <include>ch.qos.reload4j:reload4j</include>
         <include>org.apache.htrace:htrace-core4</include>
         <include>org.apache.htrace:htrace-core</include>
         <include>org.apache.yetus:audience-annotations</include>
         <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
+        <include>org.slf4j:slf4j-reload4j</include>
       </includes>
     </dependencySet>
     <dependencySet>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 4d0a2edba97..570897d4033 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -163,6 +163,7 @@
                   <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
                   <exclude>junit:junit</exclude>
                   <exclude>log4j:log4j</exclude>
+                  <exclude>ch.qos.reload4j:*</exclude>
                   <exclude>commons-logging:commons-logging</exclude>
                   <exclude>org.slf4j:slf4j-api</exclude>
                   <exclude>org.apache.yetus:audience-annotations</exclude>
diff --git a/hbase-shaded/hbase-shaded-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
index f9ac3fb898e..071f899d560 100644
--- a/hbase-shaded/hbase-shaded-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-check-invariants/pom.xml
@@ -109,6 +109,7 @@
                     <!-- We leave logging stuff alone -->
                     <exclude>org.slf4j:*</exclude>
                     <exclude>log4j:*</exclude>
+                    <exclude>ch.qos.reload4j:*</exclude>
                     <exclude>commons-logging:*</exclude>
                     <!-- annotations that never change -->
                     <exclude>com.google.code.findbugs:*</exclude>
diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml
index de8b1bbd127..03d00174114 100644
--- a/hbase-shaded/hbase-shaded-testing-util/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml
@@ -167,6 +167,7 @@
                                     <exclude>org.apache.htrace:*</exclude>
                                     <exclude>org.apache.yetus:*</exclude>
                                     <exclude>log4j:*</exclude>
+                                    <exclude>ch.qos.reload4j:*</exclude>
                                     <exclude>commons-logging:*</exclude>
                                     <exclude>org.javassist:*</exclude>
                                     <exclude>io.opentelemetry:*</exclude>
diff --git a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
index 90d5be2510e..48c4a3d131b 100644
--- a/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
+++ b/hbase-shaded/hbase-shaded-with-hadoop-check-invariants/pom.xml
@@ -98,6 +98,7 @@
                     <!-- We leave logging stuff alone -->
                     <exclude>org.slf4j:*</exclude>
                     <exclude>log4j:*</exclude>
+                    <exclude>ch.qos.reload4j:*</exclude>
                     <exclude>commons-logging:*</exclude>
                     <!-- annotations that never change -->
                     <exclude>com.google.code.findbugs:*</exclude>
diff --git a/pom.xml b/pom.xml
index 79ff2144d97..e247e5856a1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1533,7 +1533,7 @@
     <hamcrest.version>1.3</hamcrest.version>
     <opentelemetry.version>1.0.1</opentelemetry.version>
     <opentelemetry-javaagent.version>1.0.1</opentelemetry-javaagent.version>
-    <reload4j.version>1.2.18.3</reload4j.version>
+    <reload4j.version>1.2.19</reload4j.version>
     <mockito-core.version>2.28.2</mockito-core.version>
     <!--Internally we use a different version of protobuf. See hbase-protocol-shaded-->
     <external.protobuf.groupid>com.google.protobuf</external.protobuf.groupid>