From bd0b42dbd864780a26d19f784edc88fbcab34366 Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Mon, 28 Oct 2024 11:47:43 +0000
Subject: [PATCH 1/6] dependency analysis in gitlab

---
 pom.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3c291b1..4b49cc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,10 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast-spring</artifactId>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.core</groupId>
             <artifactId>datawave-core-cached-results</artifactId>
@@ -144,6 +148,14 @@
             <groupId>gov.nsa.datawave.core</groupId>
             <artifactId>datawave-core-common-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>authorization-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>base-rest-responses</artifactId>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>hazelcast-client</artifactId>
@@ -152,6 +164,14 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave-audit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>spring-boot-starter-datawave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>spring-boot-starter-datawave-audit</artifactId>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave-query</artifactId>
@@ -160,10 +180,42 @@
             <groupId>gov.nsa.datawave.webservices</groupId>
             <artifactId>datawave-ws-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

From 4e43434dadf83550af0caee1caf0b9444222959b Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Tue, 12 Nov 2024 15:33:47 +0000
Subject: [PATCH 2/6] tweaks

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

diff --git a/pom.xml b/pom.xml
index 4b49cc3..6bc3ce8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,11 +162,11 @@
         </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
-            <artifactId>spring-boot-starter-datawave-audit</artifactId>
+            <artifactId>spring-boot-starter-datawave</artifactId>
         </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
-            <artifactId>spring-boot-starter-datawave</artifactId>
+            <artifactId>spring-boot-starter-datawave-audit</artifactId>
         </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>

From 0999c0ece863b7235711874ff4e7c4b5d8dfc4f3 Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Wed, 13 Nov 2024 19:46:32 +0000
Subject: [PATCH 3/6] used undeclared fixed

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

diff --git a/pom.xml b/pom.xml
index 6bc3ce8..dd03186 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,8 @@
     </scm>
     <properties>
         <version.datawave>7.3.0</version.datawave>
-        <version.datawave.hazelcast-client>4.0.2</version.datawave.hazelcast-client>
+        <version.datawave.hazelcast>4.0.2</version.datawave.hazelcast>
+        <version.datawave.query-api>1.0.0</version.datawave.query-api>
         <version.datawave.starter>4.0.4</version.datawave.starter>
         <version.datawave.starter-audit>4.0.3</version.datawave.starter-audit>
         <version.datawave.starter-query>1.0.8</version.datawave.starter-query>
@@ -66,7 +67,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>hazelcast-client</artifactId>
-                <version>${version.datawave.hazelcast-client}</version>
+                <version>${version.datawave.hazelcast}</version>
             </dependency>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
@@ -160,6 +161,16 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>hazelcast-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>hazelcast-common</artifactId>
+            <version>${version.datawave.hazelcast}</version>
+        </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>query-api</artifactId>
+            <version>${version.datawave.query-api}</version>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave</artifactId>

From a80b233f26e408d07fa46d3a87727fd6f646f956 Mon Sep 17 00:00:00 2001
From: Christopher Gross cogross <christopher.gross@red-drum.com>
Date: Fri, 22 Nov 2024 17:04:20 +0000
Subject: [PATCH 4/6] hazelcast & hazelcast-client

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

diff --git a/pom.xml b/pom.xml
index dd03186..eb575a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
     <properties>
         <version.datawave>7.3.0</version.datawave>
         <version.datawave.hazelcast>4.0.2</version.datawave.hazelcast>
+        <version.datawave.hazelcast-client>4.0.2</version.datawave.hazelcast-client>
         <version.datawave.query-api>1.0.0</version.datawave.query-api>
         <version.datawave.starter>4.0.4</version.datawave.starter>
         <version.datawave.starter-audit>4.0.3</version.datawave.starter-audit>
@@ -67,7 +68,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>hazelcast-client</artifactId>
-                <version>${version.datawave.hazelcast}</version>
+                <version>${version.datawave.hazelcast-client}</version>
             </dependency>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>

From 4784b648e785ad723bf2e7cbc35fd0cceb69a3f0 Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Mon, 16 Dec 2024 18:29:37 +0000
Subject: [PATCH 5/6] removed duplicate lines

---
 pom.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb575a1..4623e73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,14 +176,6 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave</artifactId>
         </dependency>
-        <dependency>
-            <groupId>gov.nsa.datawave.microservice</groupId>
-            <artifactId>spring-boot-starter-datawave-audit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>gov.nsa.datawave.microservice</groupId>
-            <artifactId>spring-boot-starter-datawave-audit</artifactId>
-        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave-query</artifactId>

From b1daa10caa227c97881b57b67b30ab4fac8ac2da Mon Sep 17 00:00:00 2001
From: Christopher Gross <christopher.gross@red-drum.com>
Date: Wed, 18 Dec 2024 13:53:11 +0000
Subject: [PATCH 6/6] add query starter dependency

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

diff --git a/pom.xml b/pom.xml
index 4623e73..7bbeafb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,10 @@
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave</artifactId>
         </dependency>
+        <dependency>
+            <groupId>gov.nsa.datawave.microservice</groupId>
+            <artifactId>spring-boot-starter-datawave-audit</artifactId>
+        </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave-query</artifactId>