From 049b640a832ddb4368f68dc3ddf0b5e6b39cdb0e Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Wed, 25 Sep 2024 17:15:44 +0000
Subject: [PATCH 1/5] dependency analysis in gitlab

---
 pom.xml | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3d1ab15..55877bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,13 @@
         <spotbugs.excludes.file>${project.basedir}/src/main/spotbugs/excludes.xml</spotbugs.excludes.file>
         <version.assertj>3.20.2</version.assertj>
         <version.common-utils>3.0.0</version.common-utils>
+        <version.commons-codec>1.7</version.commons-codec>
         <version.commons-lang3>3.12.0</version.commons-lang3>
         <version.commons-net>3.6</version.commons-net>
         <version.geowave>1.2.0</version.geowave>
+        <version.guava>28.1-jre</version.guava>
+        <version.jackson>2.10.1</version.jackson>
+        <version.jakarta-bind-api>2.3.3</version.jakarta-bind-api>
         <version.jaxb>2.3.3</version.jaxb>
         <version.jts>1.19.0</version.jts>
         <version.protostuff>1.6.2</version.protostuff>
@@ -121,10 +125,30 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${version.jackson}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>${version.guava}</version>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>${version.commons-codec}</version>
+        </dependency>
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
@@ -133,14 +157,25 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>common-utils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.protostuff</groupId>
+            <artifactId>protostuff-api</artifactId>
+            <version>${version.protostuff}</version>
+        </dependency>
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-collectionschema</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>${version.jakarta-bind-api}</version>
+        </dependency>
+        <!--
         <dependency>
             <groupId>io.protostuff</groupId>
             <artifactId>protostuff-core</artifactId>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -162,6 +197,11 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

From 988661d4c0bf1d3ce70b686d5955e217761a837f Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Mon, 23 Dec 2024 19:11:00 +0000
Subject: [PATCH 2/5] jts-core

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55877bd..7465167 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
         <version.jackson>2.10.1</version.jackson>
         <version.jakarta-bind-api>2.3.3</version.jakarta-bind-api>
         <version.jaxb>2.3.3</version.jaxb>
-        <version.jts>1.19.0</version.jts>
+        <version.jts-core>1.19.0</version.jts-core>
         <version.protostuff>1.6.2</version.protostuff>
         <version.slf4j>1.7.29</version.slf4j>
     </properties>
@@ -109,7 +109,7 @@
             <dependency>
                 <groupId>org.locationtech.jts</groupId>
                 <artifactId>jts-core</artifactId>
-                <version>${version.jts}</version>
+                <version>${version.jts-core}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

From aeb9db725e030f191598ef143c890584a7e17883 Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Wed, 22 Jan 2025 20:45:47 +0000
Subject: [PATCH 3/5] versioning off for hs testing

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7465167..feda906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.1-depfix</version>
         <relativePath>../../../microservices/microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>type-utils</artifactId>
-    <version>3.1.3-SNAPSHOT</version>
+    <version>3.1.3-depfix</version>
     <url>https://code.nsa.gov/datawave-type-utils</url>
     <licenses>
         <license>
@@ -26,7 +26,7 @@
         <datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
         <spotbugs.excludes.file>${project.basedir}/src/main/spotbugs/excludes.xml</spotbugs.excludes.file>
         <version.assertj>3.20.2</version.assertj>
-        <version.common-utils>3.0.0</version.common-utils>
+        <version.common-utils>3.0.1-depfix</version.common-utils>
         <version.commons-codec>1.7</version.commons-codec>
         <version.commons-lang3>3.12.0</version.commons-lang3>
         <version.commons-net>3.6</version.commons-net>

From 6e85f4902f2cd0cd7515b938191d856fe7c6e6b7 Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Wed, 19 Feb 2025 15:18:24 +0000
Subject: [PATCH 4/5] exclude javax.el, re-version

---
 pom.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index feda906..1264b41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-parent</artifactId>
-        <version>4.0.1-depfix</version>
+        <version>4.0.0</version>
         <relativePath>../../../microservices/microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>type-utils</artifactId>
-    <version>3.1.3-depfix</version>
+    <version>3.1.3-SNAPHSOT</version>
     <url>https://code.nsa.gov/datawave-type-utils</url>
     <licenses>
         <license>
@@ -26,7 +26,7 @@
         <datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
         <spotbugs.excludes.file>${project.basedir}/src/main/spotbugs/excludes.xml</spotbugs.excludes.file>
         <version.assertj>3.20.2</version.assertj>
-        <version.common-utils>3.0.1-depfix</version.common-utils>
+        <version.common-utils>3.0.0</version.common-utils>
         <version.commons-codec>1.7</version.commons-codec>
         <version.commons-lang3>3.12.0</version.commons-lang3>
         <version.commons-net>3.6</version.commons-net>
@@ -50,6 +50,12 @@
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>common-utils</artifactId>
                 <version>${version.common-utils}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>javax.el</artifactId>
+                        <groupId>javax.el</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.protostuff</groupId>

From 998fd217cd3e864de0f203919a22a801d9227e38 Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Thu, 20 Feb 2025 21:04:06 +0000
Subject: [PATCH 5/5] fix SNAPSHOT typo

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1264b41..1f5ac2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../../../microservices/microservice-parent/pom.xml</relativePath>
     </parent>
     <artifactId>type-utils</artifactId>
-    <version>3.1.3-SNAPHSOT</version>
+    <version>3.1.3-SNAPSHOT</version>
     <url>https://code.nsa.gov/datawave-type-utils</url>
     <licenses>
         <license>