From 57b4ca291f914b35aa10b4f6b4180972727e108c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sat, 16 Mar 2024 23:55:01 -0400
Subject: [PATCH] [pom] Use commons-logging again instead of jcl-over-slf4j and
 cleanup

Commons-logging is bad from the beyond.  It now understands slf4j and log4j2.  There are efforts now to deprecate jcl-over-slf4j, log4j-jcl, and spring-jcl in favor of this which is built from how spring-jcl worked.
---
 pom.xml | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ac2a481..c45cc3fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,12 +213,11 @@
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
       <version>1.9.4</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>net.revelc.code.formatter</groupId>
@@ -239,12 +238,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-digester3</artifactId>
       <version>3.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -272,11 +265,6 @@
       <artifactId>jsoup</artifactId>
       <version>1.17.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.36</version>
-    </dependency>
     <dependency>
       <groupId>org.w3c.css</groupId>
       <artifactId>sac</artifactId>
@@ -298,8 +286,8 @@
           <ignoredUnusedDeclaredDependencies>
             <!-- ignore transitive dependency overridden to avoid vulnerability -->
             <ignore>commons-beanutils:commons-beanutils</ignore>
-            <!-- ignore alignment with jcl-over-slf4j as we intentially dropped commons logging -->
-            <ignore>org.slf4j:jcl-over-slf4j</ignore>
+            <!-- ignore alignment with commons-logging to support slf4j -->
+            <ignore>commons-logging:commons-logging</ignore>
             <!-- ignore alignment with plexus-xml as required to ensure plexus-utils uses maven 3 -->
             <ignore>org.codehaus.plexus:plexus-xml</ignore>
           </ignoredUnusedDeclaredDependencies>