From a134088461e9fd5b209df3ed31e3919dfbe0c9ce Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Thu, 11 Dec 2025 15:57:17 +0100
Subject: [PATCH 1/2] HBASE-29770 Exclude commons-logging from HBase

---
 pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0fdbd2145a5a..226409433705 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1513,6 +1513,12 @@
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>${httpclient.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
@@ -1528,6 +1534,12 @@
         <groupId>commons-validator</groupId>
         <artifactId>commons-validator</artifactId>
         <version>${commons-validator.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
@@ -4290,6 +4302,10 @@
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-reload4j</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
@@ -4351,6 +4367,10 @@
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>jsr311-api</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
               <exclusion>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>

From fb26b343e2cba0ef689ff3d4da4feeed53b4ae36 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Fri, 12 Dec 2025 08:53:06 +0100
Subject: [PATCH 2/2] add missing jcl-over-slf4j dependency to
 hbase-diagnostics

---
 hbase-diagnostics/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hbase-diagnostics/pom.xml b/hbase-diagnostics/pom.xml
index 78e47ac38ab1..6992233b16d5 100644
--- a/hbase-diagnostics/pom.xml
+++ b/hbase-diagnostics/pom.xml
@@ -196,6 +196,11 @@
       <artifactId>jul-to-slf4j</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-1.2-api</artifactId>