From c564d70433569b286a30098547c0721c5b4bef64 Mon Sep 17 00:00:00 2001
From: Daniel Roberts ddanielr <ddanielr@gmail.com>
Date: Fri, 22 Aug 2025 17:42:16 +0000
Subject: [PATCH 1/2] Removes the include for slf4j-log4j12

Component is no longer needed
---
 src/main/assemble/component.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/assemble/component.xml b/src/main/assemble/component.xml
index d16b7fb..702d240 100644
--- a/src/main/assemble/component.xml
+++ b/src/main/assemble/component.xml
@@ -37,7 +37,6 @@
         <include>commons-lang:commons-lang</include>
         <include>org.apache.thrift:libthrift</include>
         <include>org.slf4j:slf4j-api</include>
-        <include>org.slf4j:slf4j-log4j12</include>
       </includes>
     </dependencySet>
   </dependencySets>

From 83832d9f9d545001ecf2f2e1c8cb15c3392816f3 Mon Sep 17 00:00:00 2001
From: Daniel Roberts ddanielr <ddanielr@gmail.com>
Date: Fri, 22 Aug 2025 18:20:34 +0000
Subject: [PATCH 2/2] Removes StringUtils as a dependency

Removes the need for StringUtils by using the String.isBlank() methods
---
 pom.xml                                            | 5 -----
 src/main/assemble/component.xml                    | 1 -
 src/main/java/org/apache/accumulo/proxy/Proxy.java | 4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3ec525e..1efd439 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,11 +145,6 @@
       <artifactId>guava</artifactId>
       <version>32.0.0-jre</version>
     </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-    </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-core</artifactId>
diff --git a/src/main/assemble/component.xml b/src/main/assemble/component.xml
index 702d240..e670c87 100644
--- a/src/main/assemble/component.xml
+++ b/src/main/assemble/component.xml
@@ -34,7 +34,6 @@
         version listing for packaged artifacts -->
         <include>${groupId}:${artifactId}</include>
         <include>com.google.guava:guava</include>
-        <include>commons-lang:commons-lang</include>
         <include>org.apache.thrift:libthrift</include>
         <include>org.slf4j:slf4j-api</include>
       </includes>
diff --git a/src/main/java/org/apache/accumulo/proxy/Proxy.java b/src/main/java/org/apache/accumulo/proxy/Proxy.java
index 631320c..c00bff9 100644
--- a/src/main/java/org/apache/accumulo/proxy/Proxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/Proxy.java
@@ -48,7 +48,6 @@
 import org.apache.accumulo.server.rpc.TimedProcessor;
 import org.apache.accumulo.server.rpc.UGIAssumingProcessor;
 import org.apache.accumulo.start.spi.KeywordExecutable;
-import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.thrift.TProcessor;
 import org.apache.thrift.protocol.TCompactProtocol;
@@ -233,7 +232,8 @@ public static ServerAddress createProxyServer(HostAndPort address,
         }
         final KerberosToken kerberosToken = (KerberosToken) authToken;
         final String kerberosKeytab = kerberosToken.getKeytab().getAbsolutePath();
-        if (StringUtils.isBlank(kerberosPrincipal) || StringUtils.isBlank(kerberosKeytab)) {
+
+        if (kerberosPrincipal.isBlank() || kerberosKeytab.isBlank()) {
           throw new IllegalStateException(
               String.format("Kerberos principal '%s' and keytab '%s' must be provided",
                   kerberosPrincipal, kerberosKeytab));