From eeb1e5d6e96f0c84c82d49671cc3fac73ff7137e Mon Sep 17 00:00:00 2001
From: Whitney O'Meara <james.w.omeara@gmail.com>
Date: Tue, 2 Apr 2024 21:50:14 +0000
Subject: [PATCH] Eliminate log4j from maven plugins

---
 pom.xml                                               | 6 +++---
 src/main/java/datawave/query/model/FieldMapping.java  | 8 ++++----
 src/main/java/datawave/query/model/QueryModel.java    | 2 +-
 src/main/java/datawave/query/util/MetadataHelper.java | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index b92bf62..bf3aebe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.0.4</version>
         <relativePath>../../../microservices/microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>metadata-utils</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
     <url>https://code.nsa.gov/datawave-metadata-utils</url>
     <licenses>
         <license>
@@ -29,7 +29,7 @@
         <version.easymock>4.0.2</version.easymock>
         <version.kryo>2.20</version.kryo>
         <version.powermock>2.0.2</version.powermock>
-        <version.type-utils>2.0.0</version.type-utils>
+        <version.type-utils>2.0.2</version.type-utils>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/src/main/java/datawave/query/model/FieldMapping.java b/src/main/java/datawave/query/model/FieldMapping.java
index 84d84ca..7d7ba34 100644
--- a/src/main/java/datawave/query/model/FieldMapping.java
+++ b/src/main/java/datawave/query/model/FieldMapping.java
@@ -12,10 +12,10 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.apache.commons.lang.builder.CompareToBuilder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.CompareToBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @XmlAccessorType(XmlAccessType.NONE)
 public class FieldMapping implements Serializable, Comparable<FieldMapping> {
diff --git a/src/main/java/datawave/query/model/QueryModel.java b/src/main/java/datawave/query/model/QueryModel.java
index ecc4973..17b1da8 100644
--- a/src/main/java/datawave/query/model/QueryModel.java
+++ b/src/main/java/datawave/query/model/QueryModel.java
@@ -105,7 +105,7 @@ public String remapParameter(String projectFields, Multimap<String,String> model
         
         Collection<String> newMappings = remapParameter(projectFieldsList, model);
         
-        return org.apache.commons.lang.StringUtils.join(newMappings, PARAM_VALUE_SEP);
+        return org.apache.commons.lang3.StringUtils.join(newMappings, PARAM_VALUE_SEP);
         
     }
     
diff --git a/src/main/java/datawave/query/util/MetadataHelper.java b/src/main/java/datawave/query/util/MetadataHelper.java
index 430174a..50d791c 100644
--- a/src/main/java/datawave/query/util/MetadataHelper.java
+++ b/src/main/java/datawave/query/util/MetadataHelper.java
@@ -42,7 +42,7 @@
 import org.apache.accumulo.core.iterators.user.SummingCombiner;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.ColumnVisibility;
-import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.WritableUtils;
 import org.slf4j.Logger;