diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml
index 4d0e0e74c19..358dee92404 100644
--- a/core/cached-results/pom.xml
+++ b/core/cached-results/pom.xml
@@ -11,11 +11,23 @@
+
+ com.google.guava
+ guava
+
+
+ commons-lang
+ commons-lang
+
gov.nsa.datawave
datawave-core
${project.version}
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
gov.nsa.datawave.microservice
base-rest-responses
@@ -49,5 +61,13 @@
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml
index 6875f21364b..f13a814316f 100644
--- a/core/common-util/pom.xml
+++ b/core/common-util/pom.xml
@@ -14,17 +14,22 @@
- gov.nsa.datawave.core
- datawave-core-connection-pool
- ${project.version}
+ gov.nsa.datawave.microservice
+ authorization-api
- gov.nsa.datawave.microservice
- accumulo-utils
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
- gov.nsa.datawave.microservice
- authorization-api
+ org.apache.commons
+ commons-lang3
+ ${version.commons-lang3}
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
org.apache.accumulo
diff --git a/core/common/pom.xml b/core/common/pom.xml
index ea16dc9a11b..6b86534e07d 100644
--- a/core/common/pom.xml
+++ b/core/common/pom.xml
@@ -12,31 +12,19 @@
- org.apache.accumulo
- accumulo-core
- ${version.accumulo}
-
-
- org.slf4j
- *
-
-
- commons-logging
- commons-logging
-
-
- junit
- junit
-
-
- log4j
- log4j
-
-
- javax.servlet
- servlet-api
-
-
+ gov.nsa.datawave.microservice
+ dictionary-api
+ ${version.microservice.dictionary-api}
+
+
+ gov.nsa.datawave.microservice
+ query-api
+ ${version.microservice.query-api}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
org.springframework
@@ -46,14 +34,23 @@
+
+ gov.nsa.datawave.microservice
+ dictionary-api
+
+
+ gov.nsa.datawave.microservice
+ query-api
+
gov.nsa.datawave.webservices
datawave-ws-client
${project.version}
- org.apache.accumulo
- accumulo-core
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
org.springframework
diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml
index 7362abb1741..ede53413b7d 100644
--- a/core/connection-pool/pom.xml
+++ b/core/connection-pool/pom.xml
@@ -8,47 +8,59 @@
datawave-core-connection-pool
${project.artifactId}
-
- 2.1.8
-
-
-
-
- dnsjava
- dnsjava
- ${version.dnsjava}
-
-
-
+
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
-
-
- commons-configuration
- commons-configuration
+ com.google.guava
+ guava
commons-lang
commons-lang
-
- dnsjava
- dnsjava
-
gov.nsa.datawave
datawave-in-memory-accumulo
gov.nsa.datawave.microservice
- accumulo-api
+ accumulo-utils
+
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
junit
junit
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.commons
+ commons-pool2
+ 2.4.2
+
+
+ org.apache.curator
+ curator-client
+
+
+ org.apache.curator
+ curator-framework
+
org.apache.curator
curator-recipes
@@ -57,6 +69,19 @@
org.apache.curator
curator-test
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
+
+ org.apache.zookeeper
+ zookeeper
+
+
+ org.apache.zookeeper
+ zookeeper-jute
+ ${version.zookeeper}
+
org.easymock
easymock
diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml
index 273a6022c12..515ad915d7d 100644
--- a/core/map-reduce/pom.xml
+++ b/core/map-reduce/pom.xml
@@ -9,6 +9,10 @@
datawave-core-map-reduce
${project.artifactId}
+
+ commons-codec
+ commons-codec
+
gov.nsa.datawave.core
datawave-core-common-util
@@ -23,15 +27,56 @@
gov.nsa.datawave.microservice
mapreduce-query-api
+
+ gov.nsa.datawave.microservice
+ query-api
+ compile
+
gov.nsa.datawave.webservices
datawave-ws-client
${project.version}
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
+
+ org.springframework
+ spring-context
+
+
+ org.springframework
+ spring-core
+
org.jboss.resteasy
resteasy-jaxrs
provided
+
+ org.jboss.spec.javax.xml.bind
+ jboss-jaxb-api_2.3_spec
+ ${version.jboss}
+ provided
+
diff --git a/core/query/pom.xml b/core/query/pom.xml
index 1019818ea56..a803e791be2 100644
--- a/core/query/pom.xml
+++ b/core/query/pom.xml
@@ -11,13 +11,42 @@
- gov.nsa.datawave.core
- datawave-core-cached-results
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+ com.google.code.findbugs
+ jsr305
+ ${version.googlecode-findbugs}
+
+
+ com.google.guava
+ guava
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ commons-lang
+ commons-lang
+
+
+ gov.nsa.datawave
+ datawave-core
${project.version}
gov.nsa.datawave.core
- datawave-core-common
+ datawave-core-cached-results
${project.version}
@@ -30,14 +59,38 @@
datawave-core-connection-pool
${project.version}
+
+ gov.nsa.datawave.microservice
+ accumulo-api
+
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
gov.nsa.datawave.microservice
audit-api
+
+ gov.nsa.datawave.microservice
+ authorization-api
+
gov.nsa.datawave.microservice
base-rest-responses
+
+ gov.nsa.datawave.microservice
+ common-utils
+
+
+ gov.nsa.datawave.microservice
+ dictionary-api
+
+
+ gov.nsa.datawave.microservice
+ query-api
+
gov.nsa.datawave.microservice
query-metric-api
@@ -57,6 +110,53 @@
+
+ io.protostuff
+ protostuff-api
+
+
+ io.protostuff
+ protostuff-core
+
+
+ io.protostuff
+ protostuff-runtime
+ ${version.protostuff}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.commons
+ commons-collections4
+
+
+ org.apache.commons
+ commons-lang3
+ ${version.commons-lang3}
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
+
+ org.springframework
+ spring-beans
+
+
+ org.springframework
+ spring-core
+
junit
junit
diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml
index 89e99d0876b..26233bcd48c 100644
--- a/warehouse/core/pom.xml
+++ b/warehouse/core/pom.xml
@@ -188,11 +188,6 @@
org.springframework
spring-context
-
- xml-apis
- xml-apis
- ${version.xml-apis}
-
org.apache.accumulo
accumulo-server-base
diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml
index 741fade9245..0bb6a072060 100644
--- a/web-services/client/pom.xml
+++ b/web-services/client/pom.xml
@@ -34,6 +34,10 @@
gov.nsa.datawave.microservice
accumulo-api
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
gov.nsa.datawave.microservice
base-rest-responses
@@ -109,10 +113,6 @@
-
- org.apache.commons
- commons-collections4
-
org.easymock
easymock
@@ -175,6 +175,12 @@
junit-jupiter-api
test
+
+ org.powermock
+ powermock-api-support
+ ${version.powermock}
+ test
+
${project.artifactId}
diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml
index 3da465c68bb..49fce68495d 100644
--- a/web-services/common-util/pom.xml
+++ b/web-services/common-util/pom.xml
@@ -26,6 +26,11 @@
+
+ gov.nsa.datawave.core
+ datawave-core-connection-pool
+ ${project.version}
+
gov.nsa.datawave.core
datawave-core-connection-pool
@@ -78,6 +83,11 @@
commons-lang3
${version.commons-lang3}
+
+ org.apache.commons
+ commons-lang3
+ ${version.commons-lang3}
+
org.apache.deltaspike.core
deltaspike-core-api