From 18321ed120a417ca8cceb5a55145cd58cb0213fa Mon Sep 17 00:00:00 2001
From: Norbert Meszaros <meszinorbi2002@gmail.com>
Date: Wed, 21 May 2025 16:09:51 +0200
Subject: [PATCH] PHOENIX-7600 Replace commons-logging with slf4j

---
 phoenix5-hive-shaded/pom.xml |  6 ++++++
 phoenix5-hive/pom.xml        | 13 ++++++++++++
 phoenix5-hive4/pom.xml       | 34 +++++++++++++++++++++++++++++++
 phoenix5-spark/pom.xml       |  5 +++++
 pom.xml                      | 39 ++++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+)

diff --git a/phoenix5-hive-shaded/pom.xml b/phoenix5-hive-shaded/pom.xml
index ca517a96..dcf735d3 100644
--- a/phoenix5-hive-shaded/pom.xml
+++ b/phoenix5-hive-shaded/pom.xml
@@ -125,6 +125,12 @@
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Mark every Hadoop jar as provided -->
diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index 8abea8c8..e9734540 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -106,6 +106,10 @@
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>*</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -146,6 +150,11 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Phoenix Test dependencies -->
     <dependency>
@@ -193,6 +202,10 @@
           <groupId>io.netty</groupId>
           <artifactId>netty</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
       </exclusions>
       <type>test-jar</type>
       <scope>test</scope> <!-- ? -->
diff --git a/phoenix5-hive4/pom.xml b/phoenix5-hive4/pom.xml
index a59cc223..2735888e 100644
--- a/phoenix5-hive4/pom.xml
+++ b/phoenix5-hive4/pom.xml
@@ -124,6 +124,12 @@
       <artifactId>hive-exec</artifactId>
       <version>${hive.version}</version>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId> org.apache.hive</groupId>
@@ -156,6 +162,11 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Phoenix Test dependencies -->
     <dependency>
@@ -219,6 +230,10 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-reload4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
       </exclusions>
       <type>test-jar</type>
       <scope>test</scope> <!-- ? -->
@@ -237,6 +252,12 @@
       <artifactId>hive-standalone-metastore-common</artifactId>
       <version>${hive.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
         <dependency>
             <groupId> org.apache.hive</groupId>
@@ -257,12 +278,24 @@
             <version>${hive.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
+            <exclusions>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+            </exclusions>
     </dependency>
             <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-standalone-metastore-server</artifactId>
             <version>${hive.version}</version>
             <scope>test</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+              </exclusion>
+            </exclusions>
     </dependency>
             <dependency>
             <groupId>org.apache.hive.hcatalog</groupId>
@@ -277,6 +310,7 @@
             <version>${hive.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
+
         </dependency>
         <dependency>
             <groupId> org.apache.hive</groupId>
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 1e5878f1..790d9681 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -332,6 +332,11 @@
       <artifactId>slf4j-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index acb45f16..9f9b3976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -527,6 +527,10 @@
             <groupId>org.apache.hbase.thirdparty</groupId>
             <artifactId>hbase-shaded-jersey</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -691,6 +695,10 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-hdfs</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -715,6 +723,10 @@
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -807,6 +819,10 @@
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -823,6 +839,12 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-minicluster</artifactId>
         <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -897,6 +919,12 @@
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdfs</artifactId>
         <version>${hadoop.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -904,6 +932,12 @@
         <version>${hadoop.version}</version>
         <type>test-jar</type> <!-- this does not work which is typical for maven. -->
         <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hadoop</groupId>
@@ -923,6 +957,11 @@
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
       <dependency>
         <!-- for exclusion -->
         <groupId>org.slf4j</groupId>