diff --git a/pom.xml b/pom.xml index 3ec525e..1efd439 100644 --- a/pom.xml +++ b/pom.xml @@ -145,11 +145,6 @@ guava 32.0.0-jre - - commons-lang - commons-lang - 2.6 - io.micrometer micrometer-core diff --git a/src/main/assemble/component.xml b/src/main/assemble/component.xml index d16b7fb..e670c87 100644 --- a/src/main/assemble/component.xml +++ b/src/main/assemble/component.xml @@ -34,10 +34,8 @@ version listing for packaged artifacts --> ${groupId}:${artifactId} com.google.guava:guava - commons-lang:commons-lang org.apache.thrift:libthrift org.slf4j:slf4j-api - org.slf4j:slf4j-log4j12 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));