diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 37a71b97cb6..f5fa5bf1d66 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -72,6 +72,9 @@ jobs:
$RUN_TESTS \
|| { echo "***** TESTS FAILED. Attempting retry."; $RUN_TESTS; } \
|| { echo "***** TESTS FAILED. Attempting final retry."; $RUN_TESTS; }
+ - name: Analyze Dependencies
+ run: |
+ mvn -V -B -e -ntp "-Dstyle.color=always" dependency:analyze package -DskipTests=true
# This step can be uncommented to support feature development. When developing a
# feature which spans multiple repos, you can update the poms to use the latest
@@ -171,4 +174,3 @@ jobs:
# docker tag ${IMAGE_NAME}:${TAG} ${REMOTE_IMAGE_NAME}:${TAG}
# docker images
# docker push ${REMOTE_IMAGE_NAME}:${TAG}
-
diff --git a/common-test/pom.xml b/common-test/pom.xml
index acb95864a43..e725f06c3a2 100644
--- a/common-test/pom.xml
+++ b/common-test/pom.xml
@@ -19,18 +19,12 @@
org.apache.accumulo
- accumulo-server-base
+ accumulo-core
- org.apache.zookeeper
- zookeeper
+ org.apache.hadoop
+ hadoop-client
-
-
-
- org.apache.hadoop
- hadoop-client
-
org.apache.hadoop
hadoop-common
diff --git a/pom.xml b/pom.xml
index d0155b288ed..3c66ba04f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,18 +54,25 @@
2.6
3.3
2.6
+ 3.9
1.2
+ 3.0
1.6
1.8
+ 2.3
5.2.0
1.9.0
+ 2.1.8
+ 3.2.6
5.2.0
2.15.0
+ 8.1.1
2.22.5
28.1
1.2.0
31.1-jre
2.0.3
+ 2.9.0
1.1.1
3.3.5
1.1.1
@@ -75,13 +82,27 @@
9.4.21.Final
2.10.0.pr1
1.9.13
+ 1.3.4
+ 2.3.3
3.24.0-GA
3.1.0
2.0.1.Final
+ 1
+ 2.2.11
+ 1.5.4
+ 2.5
+ 2.1.1
+ 1.0.1.Final
+ 1.0.0.Final
+ 3.4.0.Final
+ 3.0.12.Final
+ 1.2.6
+ 3.7.2.Final
1.72
6.1.26
4.0.19.Final
0.11.2
+ 2.12
20231013
1.19.0
4.13.2
@@ -91,6 +112,7 @@
2.20
2.17.2
7.5.0
+ 3.4.1
2.5.2
1.6.0
3.0.0
@@ -109,6 +131,7 @@
8.0.28
4.1.42.Final
2.1
+ 2.3
5.0.3.Final
2.0.9
3.16.3
@@ -120,14 +143,19 @@
2.9.6
3.2.5
0.17.0
+ 2.0.21.Final
+ 1.2.6.Final
3.1.1.Final
3.1.1.Final
2.3.5.Final
17.0.1.Final
+ 1.5.1.Final
+ 1.9.1.Final
5.4.0
3.1.4
2.12.2
+ 1.4.01
3.8.3
@@ -1421,7 +1449,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 3.1.1
+ 3.4.0
ch.qos.reload4j
@@ -1449,7 +1477,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.0.0
+ ${version.maven-enforcer-plugin}
enforce-maven
@@ -1474,8 +1502,12 @@
log4j:log4j
+ ch.qos.reload4j:reload4j
org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
+ joda-time:joda-time
+ true
true
@@ -1761,7 +1793,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.3.0
+ ${version.maven-enforcer-plugin}
de.skuzzle.enforcer
@@ -2228,7 +2260,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
- 3.3.0
+ ${version.maven-enforcer-plugin}
enforce-versions
diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml
index 80fa451539b..6a751c1a575 100644
--- a/warehouse/accumulo-extensions/pom.xml
+++ b/warehouse/accumulo-extensions/pom.xml
@@ -9,35 +9,33 @@
datawave-accumulo-extensions
${project.artifactId}
-
- com.google.guava
- guava
-
org.apache.accumulo
accumulo-core
-
- org.apache.accumulo
- accumulo-server-base
-
org.apache.hadoop
hadoop-client-api
+ ${version.hadoop}
- org.apache.hadoop
- hadoop-client-runtime
+ org.apache.logging.log4j
+ log4j-1.2-api
- com.fasterxml.woodstox
- woodstox-core
- provided
+ org.slf4j
+ slf4j-api
- org.apache.accumulo
- accumulo-start
- provided
+ com.google.guava
+ guava
+ test
+
+
+ gov.nsa.datawave
+ datawave-common-test
+ ${project.version}
+ test
junit
diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml
index 9bac332a3fb..bde83972ebb 100644
--- a/warehouse/assemble/webservice/pom.xml
+++ b/warehouse/assemble/webservice/pom.xml
@@ -9,25 +9,18 @@
assemble-webservice
${project.artifactId}
-
- commons-configuration
- commons-configuration
-
gov.nsa.datawave
datawave-ingest-core
- gov.nsa.datawave
- datawave-query-core
+ org.apache.accumulo
+ accumulo-core
org.apache.hadoop
hadoop-client-api
-
-
- org.apache.hadoop
- hadoop-client-runtime
+ ${version.hadoop}
org.powermock
@@ -37,40 +30,5 @@
org.powermock
powermock-module-junit4
-
- gov.nsa.datawave.webservices
- datawave-ws-client
- provided
-
-
- gov.nsa.datawave.webservices
- datawave-ws-common
- provided
-
-
- gov.nsa.datawave.webservices
- datawave-ws-common-util
- provided
-
-
- gov.nsa.datawave.webservices
- datawave-ws-map-reduce
- provided
-
-
- gov.nsa.datawave.webservices
- datawave-ws-query
- provided
-
-
- org.jboss.resteasy
- resteasy-jaxrs
- provided
-
-
- junit
- junit
- test
-
diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml
index a8f5547478f..04e97d99897 100644
--- a/warehouse/common/pom.xml
+++ b/warehouse/common/pom.xml
@@ -9,10 +9,6 @@
datawave-common
${project.artifactId}
-
- com.clearspring.analytics
- stream
-
commons-cli
commons-cli
@@ -21,31 +17,6 @@
commons-io
commons-io
-
- commons-lang
- commons-lang
-
-
- net.sf.opencsv
- opencsv
- 2.3
-
-
- org.apache.accumulo
- accumulo-core
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
org.easymock
easymock
diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml
index 723d89c26fd..5c2498834da 100644
--- a/warehouse/core/pom.xml
+++ b/warehouse/core/pom.xml
@@ -19,30 +19,25 @@
stream
- com.esotericsoftware.kryo
- kryo
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
- com.github.ben-manes.caffeine
- caffeine
- ${version.caffeine}
+ com.google.guava
+ guava
com.google.protobuf
protobuf-java
-
- commons-beanutils
- commons-beanutils
-
commons-cli
commons-cli
+
+ commons-codec
+ commons-codec
+
+
+ commons-lang
+ commons-lang
+
gov.nsa.datawave
datawave-common
@@ -51,14 +46,44 @@
gov.nsa.datawave
datawave-in-memory-accumulo
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
gov.nsa.datawave.microservice
accumulo-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
gov.nsa.datawave.microservice
common-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
gov.nsa.datawave.microservice
@@ -68,29 +93,50 @@
org.apache.hadoop
hadoop-common
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
- io.protostuff
- protostuff-api
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
- javax.annotation
- javax.annotation-api
- 1.3.2
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
javax.enterprise
cdi-api
- junit
- junit
+ javax.inject
+ javax.inject
- net.sf.opencsv
- opencsv
- 2.3
+ junit
+ junit
org.apache.accumulo
@@ -98,11 +144,7 @@
org.apache.commons
- commons-collections4
-
-
- org.apache.commons
- commons-jexl3
+ commons-lang3
org.apache.curator
@@ -110,27 +152,21 @@
org.apache.curator
- curator-recipes
-
-
- org.apache.hadoop
- hadoop-auth
+ curator-framework
+ ${version.curator}
org.apache.hadoop
- hadoop-client
+ hadoop-client-api
+ ${version.hadoop}
- org.apache.hadoop
- hadoop-common
+ log4j
+ log4j
org.slf4j
- slf4j-reload4j
-
-
- ch.qos.reload4j
- reload4j
+ slf4j-log4j12
@@ -139,16 +175,10 @@
log4j-1.2-api
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
+ org.apache.zookeeper
+ zookeeper-jute
+ ${version.zookeeper}
+ compile
org.slf4j
@@ -159,12 +189,9 @@
spring-context
- org.springframework
- spring-context-support
-
-
- xerces
- xercesImpl
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
org.apache.accumulo
@@ -198,6 +225,12 @@
easymock
test
+
+ org.hamcrest
+ hamcrest-core
+ ${version.hamcrest}
+ test
+
diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml
index f4fc2601bd3..7d38e1ce156 100644
--- a/warehouse/data-dictionary-core/pom.xml
+++ b/warehouse/data-dictionary-core/pom.xml
@@ -10,6 +10,10 @@
jar
${project.artifactId}
+
+ com.fasterxml.jackson.core
+ jackson-core
+
gov.nsa.datawave
datawave-query-core
@@ -18,6 +22,10 @@
gov.nsa.datawave.microservice
dictionary-api
+
+ javax.enterprise
+ cdi-api
+
@@ -27,4 +35,4 @@
-
+
\ No newline at end of file
diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml
index 3e00cc3209b..9f108a2a957 100644
--- a/warehouse/edge-dictionary-core/pom.xml
+++ b/warehouse/edge-dictionary-core/pom.xml
@@ -10,6 +10,10 @@
jar
${project.artifactId}
+
+ com.fasterxml.jackson.core
+ jackson-core
+
gov.nsa.datawave
datawave-query-core
@@ -18,6 +22,10 @@
gov.nsa.datawave.microservice
dictionary-api
+
+ javax.enterprise
+ cdi-api
+
@@ -27,4 +35,4 @@
-
+
\ No newline at end of file
diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml
index 7005be11d41..a8ff2e7bb1e 100644
--- a/warehouse/index-stats/pom.xml
+++ b/warehouse/index-stats/pom.xml
@@ -14,49 +14,71 @@
com.clearspring.analytics
stream
+
+ gov.nsa.datawave
+ datawave-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
gov.nsa.datawave
datawave-ingest-core
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
gov.nsa.datawave
datawave-query-core
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
- com.fasterxml.woodstox
- woodstox-core
- runtime
- true
+ gov.nsa.datawave.microservice
+ common-utils
- com.google.re2j
- re2j
- 1.1
- runtime
- true
+ org.apache.accumulo
+ accumulo-core
- org.apache.commons
- commons-configuration2
- runtime
- true
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
- junit
- junit
- test
+ org.apache.logging.log4j
+ log4j-1.2-api
- org.apache.accumulo
- accumulo-minicluster
- ${version.accumulo}
+ commons-lang
+ commons-lang
test
- org.javassist
- javassist
+ junit
+ junit
test
diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml
index f05cd5cefbf..15fb4e88c12 100644
--- a/warehouse/ingest-configuration/pom.xml
+++ b/warehouse/ingest-configuration/pom.xml
@@ -12,11 +12,26 @@
gov.nsa.datawave
datawave-ingest-core
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-client
+
+
javax.mail
javax.mail-api
- 1.5.4
+ ${version.javax.mail-api}
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml
index 6f9211f4131..9da891df383 100644
--- a/warehouse/ingest-core/pom.xml
+++ b/warehouse/ingest-core/pom.xml
@@ -10,75 +10,199 @@
jar
${project.artifactId}
+
+ com.beust
+ jcommander
+
com.clearspring.analytics
stream
- com.sun.xml.bind
- jaxb-impl
- 2.3.3
+ com.google.code.findbugs
+ jsr305
+
+
+ com.google.guava
+ guava
+
+
+ com.google.protobuf
+ protobuf-java
com.timgroup
java-statsd-client
- commons-collections
- commons-collections
+ commons-cli
+ commons-cli
+
+
+ commons-codec
+ commons-codec
+
+
+ commons-io
+ commons-io
+
+
+ commons-lang
+ commons-lang
gov.nsa.datawave
datawave-accumulo-extensions
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
+
+
+ gov.nsa.datawave
+ datawave-common-test
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
gov.nsa.datawave
datawave-core
${project.version}
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
+
+ gov.nsa.datawave.microservice
+ common-utils
+
+
+ gov.nsa.datawave.microservice
+ metadata-utils
+
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
jakarta.xml.bind
jakarta.xml.bind-api
- 2.3.3
+ ${version.jakarta.xml.bind-api}
- jline
- jline
- 2.12
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
org.apache.accumulo
accumulo-hadoop-mapreduce
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
org.apache.accumulo
accumulo-server-base
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
+
+
+ org.apache.commons
+ commons-collections4
org.apache.commons
commons-jexl3
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.curator
+ curator-test
+
org.apache.hadoop
hadoop-annotations
org.apache.hadoop
- hadoop-distcp
+ hadoop-client-api
+ ${version.hadoop}
org.apache.hadoop
- hadoop-mapreduce-client-common
+ hadoop-client-runtime
+ ${version.hadoop}
org.apache.hadoop
- hadoop-mapreduce-client-core
+ hadoop-distcp
org.apache.logging.log4j
@@ -95,6 +219,12 @@
org.apache.logging.log4j
log4j-slf4j-impl
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
org.apache.lucene
@@ -128,6 +258,23 @@
org.slf4j
slf4j-api
+
+ org.springframework
+ spring-context
+
+
+ org.springframework
+ spring-core
+
+
+ xerces
+ xercesImpl
+
+
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
+
io.dropwizard.metrics
metrics-core
@@ -137,19 +284,12 @@
org.apache.accumulo
accumulo-start
provided
-
-
- com.fasterxml.woodstox
- woodstox-core
- runtime
- true
-
-
- com.google.re2j
- re2j
- 1.1
- runtime
- true
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
org.apache.commons
@@ -169,21 +309,37 @@
1.18.0
test
+
+ com.google.code.gson
+ gson
+ test
+
com.sun.mail
mailapi
1.4.5
test
+
+ commons-logging
+ commons-logging
+ test
+
gov.nsa.datawave
datawave-in-memory-accumulo
test
+
+ it.unimi.dsi
+ fastutil
+ ${version.fastutil}
+ test
+
javax.mail
javax.mail-api
- 1.5.4
+ ${version.javax.mail-api}
test
@@ -196,12 +352,59 @@
accumulo-minicluster
${version.accumulo}
test
+
+
+ org.apache.accumulo
+ accumulo-server-base
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
+
+
+ org.apache.zookeeper
+ zookeeper
+ test
+
+
+ org.hamcrest
+ hamcrest-core
+ ${version.hamcrest}
+ test
org.javassist
javassist
test
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
+
+ org.springframework
+ spring-jcl
+ test
+
diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java
index a0e57a1aeba..472afc6f794 100644
--- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java
+++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java
@@ -15,8 +15,6 @@
import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import it.unimi.dsi.fastutil.Hash;
-
/** Wraps DefaultTokenSearch and exposes it as a Lucene TokenFilter. Not thread-safe */
public class TokenSearchSynonymFilter extends TokenFilter {
diff --git a/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java b/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java
index e86c0f45535..10ffafdd6be 100644
--- a/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java
+++ b/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java
@@ -9,8 +9,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jline.internal.Log;
-
/**
* (U) Worker thread for moving ingest files from the native file system into the ingest directory for the specific ingest data type.
*/
@@ -32,7 +30,7 @@ public Void call() throws InterruptedException {
try {
fs.copyFromLocalFile(false, false, srcFiles, dst);
} catch (IOException ioe) {
- Log.error("thread(" + Thread.currentThread().getId() + ") unable to copy ingest files: " + ioe.getMessage());
+ logger.error("thread(" + Thread.currentThread().getId() + ") unable to copy ingest files: " + ioe.getMessage());
}
final int waitDur = cfg.getRandomInterval();
Thread.sleep(waitDur);
diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml
index 631b7ee047b..a3e54331533 100644
--- a/warehouse/ingest-csv/pom.xml
+++ b/warehouse/ingest-csv/pom.xml
@@ -10,66 +10,113 @@
jar
${project.artifactId}
+
+ com.google.guava
+ guava
+
+
+ commons-lang
+ commons-lang
+
gov.nsa.datawave
datawave-core
${project.version}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
gov.nsa.datawave
datawave-ingest-configuration
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave
datawave-ingest-core
${project.version}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
- gov.nsa.datawave.webservices
- datawave-ws-common-util
- ${project.version}
-
-
- org.apache.hadoop
- hadoop-distcp
-
-
- org.apache.hadoop
- hadoop-mapreduce-client-common
+ org.apache.accumulo
+ accumulo-core
org.apache.hadoop
- hadoop-mapreduce-client-core
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
- org.apache.lucene
- lucene-analyzers-common
-
-
- org.apache.lucene
- lucene-core
+ org.apache.logging.log4j
+ log4j-1.2-api
org.easymock
easymock
-
- org.infinispan
- infinispan-commons
-
-
- org.jboss.resteasy
- jaxrs-api
- 3.0.12.Final
-
org.powermock
- powermock-api-easymock
+ powermock-module-junit4
- org.powermock
- powermock-module-junit4
+ org.slf4j
+ slf4j-api
com.fasterxml.woodstox
@@ -77,31 +124,26 @@
provided
- org.apache.accumulo
- accumulo-start
- provided
-
-
- org.apache.commons
- commons-configuration2
- provided
-
-
- com.sun.mail
- mailapi
- 1.4.5
+ commons-io
+ commons-io
test
- gov.nsa.datawave.webservices
- datawave-ws-common
+ gov.nsa.datawave
+ datawave-common-test
${project.version}
test
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
javax.mail
javax.mail-api
- 1.5.4
+ ${version.javax.mail-api}
test
@@ -114,10 +156,16 @@
accumulo-minicluster
${version.accumulo}
test
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
- org.javassist
- javassist
+ xerces
+ xercesImpl
test
diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml
index 92ac1458c0d..40af947b961 100644
--- a/warehouse/ingest-json/pom.xml
+++ b/warehouse/ingest-json/pom.xml
@@ -15,6 +15,18 @@
gson
2.9.0
+
+ com.google.guava
+ guava
+
+
+ commons-io
+ commons-io
+
+
+ commons-lang
+ commons-lang
+
gov.nsa.datawave
datawave-core
@@ -23,21 +35,23 @@
gov.nsa.datawave
datawave-ingest-configuration
- ${project.version}
gov.nsa.datawave
datawave-ingest-core
- ${project.version}
- gov.nsa.datawave.webservices
- datawave-ws-common-util
- ${project.version}
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.commons
+ commons-collections4
org.apache.hadoop
- hadoop-distcp
+ hadoop-client-api
+ ${version.hadoop}
org.apache.hadoop
@@ -46,28 +60,21 @@
org.apache.hadoop
hadoop-mapreduce-client-core
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
- org.apache.lucene
- lucene-analyzers-common
-
-
- org.apache.lucene
- lucene-core
+ org.apache.logging.log4j
+ log4j-1.2-api
org.easymock
easymock
-
- org.infinispan
- infinispan-commons
-
-
- org.jboss.resteasy
- jaxrs-api
- 3.0.12.Final
-
org.powermock
powermock-api-easymock
@@ -86,11 +93,6 @@
accumulo-start
provided
-
- org.apache.commons
- commons-configuration2
- provided
-
com.sun.mail
mailapi
@@ -106,7 +108,7 @@
javax.mail
javax.mail-api
- 1.5.4
+ ${version.javax.mail-api}
test
diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml
index b7da23fcf41..90ff5385fbc 100644
--- a/warehouse/ingest-nyctlc/pom.xml
+++ b/warehouse/ingest-nyctlc/pom.xml
@@ -10,18 +10,52 @@
jar
${project.artifactId}
+
+ com.google.guava
+ guava
+
+
+ gov.nsa.datawave
+ datawave-core
+
+
+ gov.nsa.datawave
+ datawave-ingest-core
+
gov.nsa.datawave
datawave-ingest-csv
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
- com.fasterxml.woodstox
- woodstox-core
- provided
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
- org.apache.commons
- commons-configuration2
+ org.apache.logging.log4j
+ log4j-1.2-api
+
+
+ org.locationtech.jts
+ jts-core
+
+
+ org.slf4j
+ slf4j-api
+
+
+ com.fasterxml.woodstox
+ woodstox-core
provided
@@ -30,12 +64,27 @@
${project.version}
tests
test
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
gov.nsa.datawave
datawave-query-core
test
+
+ junit
+ junit
+ test
+
diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml
index 069972e87ec..47fd04f1e2b 100644
--- a/warehouse/ingest-ssdeep/pom.xml
+++ b/warehouse/ingest-ssdeep/pom.xml
@@ -41,12 +41,12 @@
accumulo-core
- org.apache.hadoop
- hadoop-client-api
+ org.apache.commons
+ commons-lang3
org.apache.hadoop
- hadoop-mapreduce-client-core
+ hadoop-client-api
org.apache.logging.log4j
diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml
index 0ba62e360bf..6d391248573 100644
--- a/warehouse/ingest-wikipedia/pom.xml
+++ b/warehouse/ingest-wikipedia/pom.xml
@@ -10,33 +10,96 @@
jar
${project.artifactId}
+
+ com.google.guava
+ guava
+
+
+ commons-lang
+ commons-lang
+
gov.nsa.datawave
datawave-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
gov.nsa.datawave
datawave-ingest-configuration
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave
datawave-ingest-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+
+
+ gov.nsa.datawave.microservice
+ common-utils
+
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ log4j
+ log4j
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
- gov.nsa.datawave.webservices
- datawave-ws-common-util
-
-
- org.apache.hadoop
- hadoop-distcp
+ org.apache.accumulo
+ accumulo-core
org.apache.hadoop
- hadoop-mapreduce-client-common
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
- org.apache.hadoop
- hadoop-mapreduce-client-core
+ org.apache.logging.log4j
+ log4j-1.2-api
org.apache.lucene
@@ -50,10 +113,6 @@
org.easymock
easymock
-
- org.infinispan
- infinispan-commons
-
org.powermock
powermock-api-easymock
@@ -62,6 +121,11 @@
org.powermock
powermock-module-junit4
+
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
+
com.fasterxml.woodstox
woodstox-core
@@ -83,15 +147,10 @@
1.4.5
test
-
- gov.nsa.datawave.webservices
- datawave-ws-common
- test
-
javax.mail
javax.mail-api
- 1.5.4
+ ${version.javax.mail-api}
test
diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml
index 6e431d232f8..e2b5c4d2c7d 100644
--- a/warehouse/metrics-core/pom.xml
+++ b/warehouse/metrics-core/pom.xml
@@ -19,60 +19,51 @@
guava
- commons-configuration
- commons-configuration
+ commons-cli
+ commons-cli
- gov.nsa.datawave
- datawave-ingest-core
+ commons-lang
+ commons-lang
gov.nsa.datawave
- datawave-query-core
-
-
- javax.enterprise
- cdi-api
-
-
- org.easymock
- easymock
-
-
- org.javatuples
- javatuples
+ datawave-core
- org.jboss.spec.javax.servlet
- jboss-servlet-api_4.0_spec
-
-
- org.mortbay.jetty
- jetty
+ gov.nsa.datawave
+ datawave-ingest-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
- org.powermock
- powermock-api-easymock
+ gov.nsa.datawave.microservice
+ common-utils
- org.powermock
- powermock-module-junit4
+ org.apache.accumulo
+ accumulo-core
- junit
- junit
- test
+ org.apache.accumulo
+ accumulo-hadoop-mapreduce
- org.apache.accumulo
- accumulo-minicluster
- ${version.accumulo}
- test
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
- org.javassist
- javassist
- test
+ org.apache.logging.log4j
+ log4j-1.2-api
diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml
index 1c9c2da8920..01848a96823 100644
--- a/warehouse/ops-tools/config-compare/pom.xml
+++ b/warehouse/ops-tools/config-compare/pom.xml
@@ -8,45 +8,14 @@
datawave-ops-tools-config-compare
-
- com.google.guava
- guava
-
-
-
- commons-collections
- commons-collections
-
commons-lang
commons-lang
-
- commons-logging
- commons-logging
-
-
- org.apache.commons
- commons-collections4
-
org.apache.hadoop
hadoop-client-api
-
- org.apache.hadoop
- hadoop-client-runtime
-
-
- com.fasterxml.woodstox
- woodstox-core
- runtime
-
-
- org.apache.commons
- commons-configuration2
- runtime
-
junit
junit
@@ -55,7 +24,7 @@
org.hamcrest
hamcrest-all
- 1.3
+ ${version.hamcrest}
test
diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml
index 6cffc37ddb7..86fe8a4b59b 100644
--- a/warehouse/ops-tools/index-validation/pom.xml
+++ b/warehouse/ops-tools/index-validation/pom.xml
@@ -14,10 +14,6 @@
commons-cli
commons-cli
-
- commons-logging
- commons-logging
-
org.apache.accumulo
accumulo-core
@@ -33,40 +29,23 @@
-
- org.apache.hadoop
- hadoop-auth
- ${version.hadoop}
-
-
- *
- *
-
-
-
org.apache.hadoop
hadoop-client-api
${version.hadoop}
- org.apache.hadoop
- hadoop-client-runtime
- ${version.hadoop}
+ org.apache.logging.log4j
+ log4j-1.2-api
org.apache.zookeeper
zookeeper
- com.fasterxml.woodstox
- woodstox-core
- runtime
-
-
- org.apache.commons
- commons-configuration2
- runtime
+ gov.nsa.datawave
+ datawave-in-memory-accumulo
+ test
junit
@@ -76,7 +55,7 @@
org.hamcrest
hamcrest-all
- 1.3
+ ${version.hamcrest}
test
diff --git a/warehouse/pom.xml b/warehouse/pom.xml
index b0fcd087149..97c296cfff7 100644
--- a/warehouse/pom.xml
+++ b/warehouse/pom.xml
@@ -243,9 +243,17 @@
${version.hadoop}
- *
+ log4j
*
+
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
+
@@ -305,21 +313,61 @@
org.apache.hadoop
hadoop-yarn-api
${version.hadoop}
+
+
+ *
+ *
+
+
org.apache.hadoop
hadoop-yarn-client
${version.hadoop}
+
+
+ log4j
+ *
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
+
+
org.apache.hadoop
hadoop-yarn-common
${version.hadoop}
+
+
+ *
+ *
+
+
org.apache.hadoop
hadoop-yarn-server-common
${version.hadoop}
+
+
+ log4j
+ *
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
+
+
org.apache.xmlbeans
diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml
index dd6b7ecd21e..3912e7ce391 100644
--- a/warehouse/query-core/pom.xml
+++ b/warehouse/query-core/pom.xml
@@ -18,6 +18,10 @@
com.esotericsoftware.kryo
kryo
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
com.fasterxml.jackson.core
jackson-core
@@ -26,6 +30,15 @@
com.fasterxml.jackson.core
jackson-databind
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+
+
+ com.github.ben-manes.caffeine
+ caffeine
+ ${version.caffeine}
+
com.google.code.findbugs
annotations
@@ -38,42 +51,134 @@
com.google.guava
guava
+
+ com.google.protobuf
+ protobuf-java
+
com.googlecode.json-simple
json-simple
- commons-configuration
- commons-configuration
+ com.timgroup
+ java-statsd-client
+
+
+ commons-cli
+ commons-cli
+
+
+ commons-codec
+ commons-codec
+
+
+ commons-collections
+ commons-collections
+
+
+ commons-io
+ commons-io
+
+
+ commons-lang
+ commons-lang
+
+
+ commons-logging
+ commons-logging
commons-pool
commons-pool
+
+ gov.nsa.datawave
+ datawave-common
+
gov.nsa.datawave
datawave-core
${project.version}
+
+ gov.nsa.datawave
+ datawave-in-memory-accumulo
+
+
+ gov.nsa.datawave
+ datawave-ingest-configuration
+
+
+ gov.nsa.datawave
+ datawave-ingest-core
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
gov.nsa.datawave
datawave-ssdeep-common
${project.version}
+
+ 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
metadata-utils
+
+ log4j
+ log4j
+
org.apache.hadoop
hadoop-common
+
+ org.slf4j
+ slf4j-log4j12
+
gov.nsa.datawave.microservice
query-metric-api
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
gov.nsa.datawave.webservices
datawave-ws-client
@@ -82,25 +187,68 @@
gov.nsa.datawave.webservices
datawave-ws-common
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
datawave-ws-query
${project.version}
ejb
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
+
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
io.dropwizard.metrics
metrics-core
- javax.enterprise
- cdi-api
+ io.protostuff
+ protostuff-api
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
org.apache.accumulo
@@ -112,14 +260,59 @@
+
+ org.apache.commons
+ commons-collections4
+
org.apache.commons
commons-jexl3
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-math3
+ ${version.commons-math3}
+
+
+ org.apache.commons
+ commons-vfs2
+ ${version.commons-vfs2}
+
+
+ org.apache.curator
+ curator-client
+
+
+ org.apache.curator
+ curator-framework
+
org.apache.curator
curator-recipes
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ org.apache.hadoop
+ hadoop-mapreduce-client-core
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
org.apache.httpcomponents
httpclient
@@ -128,14 +321,26 @@
org.apache.httpcomponents
httpcore
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
org.apache.lucene
lucene-analyzers-common
+
+ org.apache.lucene
+ lucene-core
+
org.apache.lucene
lucene-queryparser
+
+ org.apache.zookeeper
+ zookeeper
+
org.assertj
assertj-core
@@ -147,6 +352,12 @@
org.geotools
gt-geojson
+
+
+ com.googlecode.json-simple
+ json-simple
+
+
org.infinispan
@@ -161,8 +372,52 @@
resteasy-jaxrs
- org.ow2.asm
- asm
+ org.locationtech.geowave
+ geowave-core-geotime
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+ org.locationtech.geowave
+ geowave-core-index
+ ${version.geowave}
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+ org.locationtech.geowave
+ geowave-core-store
+ ${version.geowave}
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+ org.locationtech.jts
+ jts-core
org.powermock
@@ -172,6 +427,10 @@
org.powermock
powermock-module-junit4
+
+ org.slf4j
+ slf4j-api
+
org.springframework
spring-beans
@@ -184,11 +443,21 @@
org.springframework
spring-core
+
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
+
com.fasterxml.woodstox
woodstox-core
provided
+
+ javax.enterprise
+ cdi-api
+ provided
+
org.apache.accumulo
accumulo-server-base
@@ -209,9 +478,14 @@
commons-configuration2
provided
+
+ com.fasterxml.jackson.datatype
+ jackson-datatype-guava
+ test
+
gov.nsa.datawave
- datawave-ingest-configuration
+ datawave-common-test
${project.version}
test
@@ -220,12 +494,24 @@
datawave-ingest-csv
${project.version}
test
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave
datawave-ingest-json
${project.version}
test
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave
@@ -238,6 +524,12 @@
datawave-ws-cached-results
${project.version}
test
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
@@ -257,6 +549,12 @@
junit
test
+
+ net.sf.opencsv
+ opencsv
+ ${version.opencsv}
+ test
+
org.apache.accumulo
accumulo-minicluster
@@ -290,8 +588,8 @@
test
- org.javassist
- javassist
+ org.jboss.arquillian.container
+ arquillian-container-test-api
test
@@ -304,6 +602,11 @@
arquillian-junit-container
test
+
+ org.jboss.arquillian.junit
+ arquillian-junit-core
+ test
+
org.jboss.logging
jboss-logging
@@ -315,6 +618,11 @@
1.4.4.Final
test
+
+ org.jboss.shrinkwrap
+ shrinkwrap-api
+ test
+
org.jboss.spec.javax.ejb
jboss-ejb-api_3.2_spec
@@ -360,6 +668,18 @@
picketbox
test
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
org.springframework
spring-test
diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml
index 15bc27add5c..db69216963a 100644
--- a/warehouse/ssdeep-common/pom.xml
+++ b/warehouse/ssdeep-common/pom.xml
@@ -13,11 +13,38 @@
UTF-8
+
+ com.google.guava
+ guava
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.commons
+ commons-lang3
+
+
+ org.apache.commons
+ commons-text
+ ${version.commons-text}
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
+
+
+ org.slf4j
+ slf4j-api
+
junit
junit
diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml
index 51471ae9125..d87a7a85666 100644
--- a/web-services/accumulo/pom.xml
+++ b/web-services/accumulo/pom.xml
@@ -11,26 +11,29 @@
${project.artifactId}
- com.fasterxml.jackson.module
- jackson-module-jaxb-annotations
+ com.fasterxml.jackson.core
+ jackson-databind
- commons-configuration
- commons-configuration
+ com.google.guava
+ guava
commons-lang
commons-lang
- dnsjava
- dnsjava
- 2.1.8
+ gov.nsa.datawave.microservice
+ accumulo-api
gov.nsa.datawave.microservice
accumulo-api
+
+ gov.nsa.datawave.microservice
+ authorization-api
+
gov.nsa.datawave.microservice
base-rest-responses
@@ -61,6 +64,26 @@
io.astefanutti.metrics.cdi
metrics-cdi
+
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
+
+
+ io.dropwizard.metrics
+ metrics-core
+ ${version.dropwizard-metrics}
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
org.apache.deltaspike.core
deltaspike-core-api
@@ -69,6 +92,20 @@
org.apache.hadoop
hadoop-client-api
+
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+ ${version.jboss}
com.fasterxml.woodstox
diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml
index cc402a89e79..f3299149133 100644
--- a/web-services/atom/pom.xml
+++ b/web-services/atom/pom.xml
@@ -10,21 +10,62 @@
ejb
${project.artifactId}
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
+
gov.nsa.datawave.webservices
datawave-ws-common
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
+
org.apache.abdera
abdera-core
-
org.apache.abdera
abdera-i18n
@@ -32,30 +73,45 @@
org.apache.abdera
abdera-parser
+ compile
- org.apache.deltaspike.core
- deltaspike-core-api
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
- org.apache.geronimo.specs
- geronimo-activation_1.1_spec
+ org.apache.deltaspike.core
+ deltaspike-core-api
org.apache.hadoop
hadoop-client-api
+ ${version.hadoop}
org.apache.hadoop
hadoop-client-runtime
+ compile
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
org.apache.ws.commons.axiom
axiom-api
+ compile
org.apache.ws.commons.axiom
axiom-impl
+ compile
com.fasterxml.woodstox
@@ -97,6 +153,11 @@
jboss-transaction-api_1.2_spec
provided
+
+ junit
+ junit
+ test
+
${project.artifactId}
@@ -120,7 +181,7 @@
lib
- abdera-core,abdera-i18n,abdera-parser,geronimo-stax-api_1.0_spec,geronimo-activation_1.1_spec,axiom-api,axiom-impl
+ abdera-core,abdera-i18n,geronimo-stax-api_1.0_spec,geronimo-activation_1.1_spec,axiom-api,axiom-impl
diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml
index cae4f5fdcee..b842164f5b1 100644
--- a/web-services/cached-results/pom.xml
+++ b/web-services/cached-results/pom.xml
@@ -25,14 +25,76 @@
gov.nsa.datawave
datawave-core
+
+
+ org.apache.hadoop
+ hadoop-client-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
query-metric-api
- javax.enterprise
- cdi-api
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ 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.commons
@@ -42,6 +104,45 @@
org.apache.commons
commons-jexl3
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.hadoop
+ hadoop-common
+ ${version.hadoop}
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ ch.qos.reload4j
+ reload4j
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
+ com.sun.jersey
+ *
+
+
+ log4j
+ *
+
+
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+
org.easymock
easymock
@@ -54,6 +155,10 @@
org.powermock
powermock-module-junit4
+
+ org.springframework
+ spring-core
+
gov.nsa.datawave.webservices
datawave-ws-client
@@ -65,24 +170,52 @@
datawave-ws-common
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
datawave-ws-query
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
gov.nsa.datawave.webservices
datawave-ws-security
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
org.jboss.resteasy
@@ -124,6 +257,18 @@
javassist
test
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
${project.artifactId}
diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml
index d5bca6e60fe..b2ecd0ab4a7 100644
--- a/web-services/client/pom.xml
+++ b/web-services/client/pom.xml
@@ -26,23 +26,10 @@
com.google.protobuf
protobuf-java
-
- commons-codec
- commons-codec
-
commons-lang
commons-lang
-
- commons-net
- commons-net
- ${version.commons-net}
-
-
- gov.nsa.datawave
- datawave-core
-
gov.nsa.datawave.microservice
accumulo-api
@@ -77,10 +64,6 @@
io.protostuff
protostuff-api
-
- io.protostuff
- protostuff-collectionschema
-
io.protostuff
protostuff-core
@@ -102,25 +85,29 @@
protostuff-yaml
- java3d
- vecmath
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
org.apache.accumulo
accumulo-core
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
+
org.apache.commons
commons-collections4
-
- org.apache.hadoop
- hadoop-client-api
-
-
- org.apache.hadoop
- hadoop-client-runtime
-
org.easymock
easymock
@@ -134,8 +121,8 @@
powermock-module-junit4
- xerces
- xercesImpl
+ org.springframework
+ spring-core
org.jboss.resteasy
@@ -169,14 +156,13 @@
test
- jakarta.xml.bind
- jakarta.xml.bind-api
- 2.3.3
+ junit
+ junit
test
- junit
- junit
+ org.apache.logging.log4j
+ log4j-1.2-api
test
@@ -243,8 +229,8 @@
lib
runtime
+ compile
provided
- test
diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml
index e2491316690..4bcf70ca569 100644
--- a/web-services/common-util/pom.xml
+++ b/web-services/common-util/pom.xml
@@ -10,34 +10,21 @@
jar
${project.artifactId}
-
- com.clearspring.analytics
- stream
-
-
- com.google.protobuf
- protobuf-java
-
-
- commons-configuration
- commons-configuration
-
commons-lang
commons-lang
- gov.nsa.datawave
- datawave-common
- ${project.version}
+ gov.nsa.datawave.microservice
+ authorization-api
gov.nsa.datawave.microservice
- accumulo-utils
+ base-rest-responses
gov.nsa.datawave.microservice
- authorization-api
+ common-utils
gov.nsa.datawave.microservice
@@ -49,53 +36,69 @@
${project.version}
- io.protostuff
- protostuff-core
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
- io.protostuff
- protostuff-json
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
- io.protostuff
- protostuff-xml
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
- io.protostuff
- protostuff-yaml
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
- org.apache.deltaspike.core
- deltaspike-core-api
-
-
- org.apache.hadoop
- hadoop-auth
+ org.apache.commons
+ commons-lang3
+ ${version.commons-lang3}
- org.apache.hadoop
- hadoop-client-api
+ org.apache.deltaspike.core
+ deltaspike-core-api
org.apache.hadoop
- hadoop-client-runtime
+ hadoop-common
+ ${version.hadoop}
+
+
+ org.slf4j
+ slf4j-reload4j
+
+
+ ch.qos.reload4j
+ reload4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ com.sun.jersey
+ *
+
+
+ log4j
+ *
+
+
- org.apache.hadoop.thirdparty
- hadoop-shaded-guava
+ org.apache.logging.log4j
+ log4j-1.2-api
org.easymock
easymock
-
- org.jboss.resteasy
- resteasy-jaxb-provider
-
-
- org.jboss.spec.javax.annotation
- jboss-annotations-api_1.3_spec
-
org.jboss.spec.javax.ejb
jboss-ejb-api_3.2_spec
@@ -104,10 +107,6 @@
org.jboss.spec.javax.interceptor
jboss-interceptors-api_1.2_spec
-
- org.jboss.spec.javax.servlet
- jboss-servlet-api_4.0_spec
-
org.powermock
powermock-api-easymock
@@ -116,6 +115,11 @@
org.powermock
powermock-module-junit4
+
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
+
com.fasterxml.jackson.core
jackson-annotations
@@ -153,13 +157,14 @@
- org.apache.commons
- commons-configuration2
+ org.apache.deltaspike.core
+ deltaspike-core-impl
provided
- org.apache.deltaspike.core
- deltaspike-core-impl
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
provided
diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml
index 8dda978a24b..4257879772d 100644
--- a/web-services/common/pom.xml
+++ b/web-services/common/pom.xml
@@ -11,13 +11,12 @@
${project.artifactId}
- aopalliance
- aopalliance
- 1.0
+ com.fasterxml.jackson.core
+ jackson-annotations
- com.clearspring.analytics
- stream
+ com.fasterxml.jackson.core
+ jackson-databind
com.fasterxml.jackson.datatype
@@ -27,22 +26,60 @@
com.google.guava
guava
-
- com.googlecode.json-simple
- json-simple
-
com.spotify
dns
- commons-configuration
- commons-configuration
+ commons-lang
+ commons-lang
+
+
+ dnsjava
+ dnsjava
+ ${version.dnsjava}
+
+
+ gov.nsa.datawave
+ datawave-common
+ ${project.version}
+
+
+ gov.nsa.datawave
+ datawave-common-test
+
+
+ gov.nsa.datawave
+ datawave-core
+
+
+ javax.enterprise
+ cdi-api
+
+
gov.nsa.datawave
datawave-in-memory-accumulo
+
+ gov.nsa.datawave.microservice
+ accumulo-api
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+
+
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
gov.nsa.datawave.microservice
audit-api
@@ -51,6 +88,10 @@
gov.nsa.datawave.microservice
authorization-api
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
gov.nsa.datawave.microservice
metrics-reporter
@@ -59,35 +100,72 @@
gov.nsa.datawave.microservice
query-metric-api
+
+ gov.nsa.datawave.webservices
+ datawave-ws-client
+ ${project.version}
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
- io.astefanutti.metrics.cdi
- metrics-cdi
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
+
+
+ io.dropwizard.metrics
+ metrics-core
+ ${version.dropwizard-metrics}
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
- io.jsonwebtoken
- jjwt-impl
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
- io.jsonwebtoken
- jjwt-jackson
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
org.apache.accumulo
accumulo-core
-
+
+ org.apache.commons
+ commons-collections4
+ ${version.commons-collections4}
+
org.apache.commons
commons-pool2
+
+ org.apache.curator
+ curator-client
+
+
+ org.apache.curator
+ curator-framework
+
org.apache.curator
curator-recipes
@@ -101,14 +179,6 @@
deltaspike-core-api
compile
-
- org.apache.hadoop
- hadoop-client-api
-
-
- org.apache.hadoop
- hadoop-client-runtime
-
org.apache.httpcomponents
httpclient
@@ -121,6 +191,11 @@
org.apache.zookeeper
zookeeper
+
+ org.apache.zookeeper
+ zookeeper-jute
+ ${version.zookeeper}
+
org.easymock
easymock
@@ -133,17 +208,25 @@
org.powermock
powermock-module-junit4
+
+ org.slf4j
+ slf4j-api
+
org.springframework
spring-aop
+
+ org.springframework
+ spring-beans
+
org.springframework
spring-context
org.springframework
- spring-context-support
+ spring-core
com.fasterxml.jackson.core
@@ -155,19 +238,10 @@
jackson-module-jaxb-annotations
provided
-
- com.fasterxml.woodstox
- woodstox-core
- provided
-
javax.enterprise
cdi-api
- provided
-
-
- org.apache.commons
- commons-configuration2
+ 2.0.SP1
provided
@@ -215,11 +289,6 @@
jboss-jms-api_2.0_spec
provided
-
- org.jboss.spec.javax.transaction
- jboss-transaction-api_1.2_spec
- provided
-
org.jboss.weld
weld-core-impl
@@ -255,6 +324,12 @@
javassist
test
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
org.springframework
spring-test
diff --git a/web-services/deploy/spring-framework-integration/pom.xml b/web-services/deploy/spring-framework-integration/pom.xml
index 076ef06c15e..28ad9bbe2b0 100644
--- a/web-services/deploy/spring-framework-integration/pom.xml
+++ b/web-services/deploy/spring-framework-integration/pom.xml
@@ -9,10 +9,41 @@
spring-framework-integration
${project.artifactId}
+
+ com.fasterxml.jackson.module
+ jackson-module-jaxb-annotations
+
+
+ gov.nsa.datawave
+ datawave-ingest-core
+ ${project.version}
+
+
+ io.astefanutti.metrics.cdi
+ metrics-cdi
+
+
+ jakarta.enterprise
+ jakarta.enterprise.cdi-api
+ 4.0.1
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+
org.easymock
easymock
+
+ org.glassfish
+ javax.el-impl
+ 3.0.1-b08-jbossorg-3
+
com.fasterxml.jackson.module
jackson-module-jaxb-annotations
@@ -110,6 +141,12 @@
arquillian-junit-container
test
+
+ org.jboss.arquillian.test
+ arquillian-test-impl-base
+ 1.8.0.Final
+ test
+
org.jboss.resteasy
resteasy-jaxrs
@@ -151,6 +188,18 @@
weld-core-impl
test
+
+ org.jboss.weld
+ weld-spi
+ 3.1.SP1
+ test
+
+
+ org.jboss.weld.module
+ weld-web
+ 3.0.0.CR2
+ test
+
org.picketbox
picketbox
diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml
index 03bb4deaf4d..e3c542c4f67 100644
--- a/web-services/dictionary/pom.xml
+++ b/web-services/dictionary/pom.xml
@@ -11,14 +11,48 @@
${project.artifactId}
- gov.nsa.datawave
- datawave-data-dictionary-core
- ${project.version}
+ dnsjava
+ dnsjava
+ ${version.dnsjava}
gov.nsa.datawave
- datawave-edge-dictionary-core
+ datawave-query-core
${project.version}
+
+
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.3_spec
+
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+
+
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.jboss.spec.javax.ejb
+ jboss-ejb-api_3.2_spec
+ ${version.jboss}
diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml
index d50271dc93d..0847efa82d4 100644
--- a/web-services/examples/client-login/pom.xml
+++ b/web-services/examples/client-login/pom.xml
@@ -30,10 +30,25 @@
protostuff-api
compile
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
javax.enterprise
cdi-api
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.3_spec
+ ${version.jboss}
+
org.picketbox
picketbox
@@ -80,4 +95,4 @@
-
+
\ No newline at end of file
diff --git a/web-services/examples/http-client/pom.xml b/web-services/examples/http-client/pom.xml
index 10462999dfc..fc4ab158ec3 100644
--- a/web-services/examples/http-client/pom.xml
+++ b/web-services/examples/http-client/pom.xml
@@ -55,6 +55,11 @@
io.protostuff
protostuff-api
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+
org.apache.accumulo
accumulo-core
@@ -106,4 +111,4 @@
-
+
\ No newline at end of file
diff --git a/web-services/map-reduce-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml
index 3254815820c..5a9b21cf88f 100644
--- a/web-services/map-reduce-embedded/pom.xml
+++ b/web-services/map-reduce-embedded/pom.xml
@@ -10,6 +10,18 @@
jar
${project.artifactId}
+
+ commons-codec
+ commons-codec
+
+
+ commons-lang
+ commons-lang
+
+
+ gov.nsa.datawave.microservice
+ authorization-api
+
gov.nsa.datawave.webservices
datawave-ws-common
@@ -17,16 +29,34 @@
gov.nsa.datawave.webservices
- datawave-ws-security
+ datawave-ws-common-util
${project.version}
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
javax.enterprise
cdi-api
- org.jboss.spec.javax.annotation
- jboss-annotations-api_1.3_spec
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
org.picketbox
diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml
index 7e41bd33616..ce8a30ccb97 100644
--- a/web-services/map-reduce-status/pom.xml
+++ b/web-services/map-reduce-status/pom.xml
@@ -11,13 +11,27 @@
${project.artifactId}
- gov.nsa.datawave.webservices
- datawave-ws-security
- ${project.version}
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
- javax.enterprise
- cdi-api
+ org.apache.logging.log4j
+ log4j-1.2-api
gov.nsa.datawave.webservices
@@ -30,12 +44,24 @@
datawave-ws-common-util
${project.version}
provided
+
+
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.2_spec
+
+
gov.nsa.datawave.webservices
datawave-ws-map-reduce
${project.version}
provided
+
+
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.2_spec
+
+
org.jboss.resteasy
@@ -57,11 +83,6 @@
jboss-interceptors-api_1.2_spec
provided
-
- junit
- junit
- test
-
${project.artifactId}
diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml
index 67fb4dc95f6..305c8d8d484 100644
--- a/web-services/map-reduce/pom.xml
+++ b/web-services/map-reduce/pom.xml
@@ -11,40 +11,77 @@
${project.artifactId}
- commons-configuration
- commons-configuration
+ com.google.guava
+ guava
- javax.enterprise
- cdi-api
+ commons-codec
+ commons-codec
- org.apache.accumulo
- accumulo-core
+ commons-lang
+ commons-lang
- org.apache.commons
- commons-compress
+ gov.nsa.datawave.microservice
+ accumulo-utils
- org.apache.hadoop
- hadoop-client-api
+ gov.nsa.datawave.microservice
+ audit-api
- org.apache.hadoop
- hadoop-client-runtime
+ gov.nsa.datawave.microservice
+ authorization-api
- org.apache.hadoop
- hadoop-mapreduce-client-core
+ 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.xml.bind-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.servlet
+ servlet-api
+ ${version.javax.servlet-api}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.accumulo
+ accumulo-hadoop-mapreduce
+
+
+ org.apache.commons
+ commons-compress
+
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
org.apache.hadoop
- hadoop-yarn-api
+ hadoop-client-api
+ ${version.hadoop}
- org.apache.hadoop.thirdparty
- hadoop-shaded-protobuf_3_7
+ org.apache.logging.log4j
+ log4j-1.2-api
org.apache.oozie
@@ -62,6 +99,11 @@
org.easymock
easymock
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+ ${version.jboss}
+
org.jboss.weld.se
weld-se-core
@@ -83,9 +125,12 @@
slf4j-api
- com.fasterxml.woodstox
- woodstox-core
- provided
+ org.springframework
+ spring-context
+
+
+ org.springframework
+ spring-core
gov.nsa.datawave
@@ -174,6 +219,24 @@
junit
test
+
+ org.powermock
+ powermock-api-support
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
org.springframework
spring-expression
diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml
index 777a323abca..35b4933aba5 100644
--- a/web-services/model/pom.xml
+++ b/web-services/model/pom.xml
@@ -19,21 +19,65 @@
guava
- com.google.protobuf
- protobuf-java
+ commons-lang
+ commons-lang
- commons-configuration
- commons-configuration
+ gov.nsa.datawave.microservice
+ accumulo-utils
- javax.enterprise
- cdi-api
+ gov.nsa.datawave.microservice
+ authorization-api
+
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ gov.nsa.datawave.microservice
+ dictionary-api
+
+
+ gov.nsa.datawave.microservice
+ metadata-utils
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
org.easymock
easymock
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+ ${version.jboss}
+
org.powermock
powermock-api-easymock
@@ -64,6 +108,12 @@
datawave-ws-common
${project.version}
provided
+
+
+ org.apache.logging.log4j
+ log4j-slf4j-impl
+
+
gov.nsa.datawave.webservices
@@ -123,6 +173,12 @@
datawave-in-memory-accumulo
test
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+ test
+
junit
junit
@@ -133,6 +189,24 @@
javassist
test
+
+ org.jboss.spec.javax.xml.bind
+ jboss-jaxb-api_2.3_spec
+ ${version.jboss}
+ test
+
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
${project.artifactId}
diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml
index f7d02e5f31d..7931602656c 100644
--- a/web-services/modification/pom.xml
+++ b/web-services/modification/pom.xml
@@ -14,14 +14,58 @@
UTF-8
+
+ gov.nsa.datawave
+ datawave-core
+
gov.nsa.datawave
datawave-query-core
${project.version}
- javax.enterprise
- cdi-api
+ gov.nsa.datawave.microservice
+ accumulo-utils
+
+
+ gov.nsa.datawave.microservice
+ authorization-api
+
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
+
+
+ org.apache.accumulo
+ accumulo-core
+
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
gov.nsa.datawave.webservices
diff --git a/web-services/pom.xml b/web-services/pom.xml
index 108a057eb05..d73f00ed79e 100644
--- a/web-services/pom.xml
+++ b/web-services/pom.xml
@@ -602,8 +602,12 @@
log4j:log4j
+ ch.qos.reload4j:reload4j
org.slf4j:slf4j-log4j12
+ org.slf4j:slf4j-reload4j
+ joda-time:joda-time
+ true
@@ -687,6 +691,10 @@
enforce-no-snapshots
none
+
+ enforce-banned-dependencies
+ validate
+
diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml
index eb93232e6b6..510a8624a47 100644
--- a/web-services/query-websocket/pom.xml
+++ b/web-services/query-websocket/pom.xml
@@ -10,6 +10,14 @@
war
${project.artifactId}
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
com.fasterxml.jackson.core
jackson-databind
@@ -18,9 +26,18 @@
com.fasterxml.jackson.module
jackson-module-jaxb-annotations
+
+ gov.nsa.datawave.microservice
+ base-rest-responses
+
+
+ gov.nsa.datawave.webservices
+ datawave-ws-client
+ ${project.version}
+
gov.nsa.datawave.webservices
- datawave-ws-common
+ datawave-ws-common-util
${project.version}
@@ -34,8 +51,23 @@
${project.version}
- javax.enterprise
- cdi-api
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ ${version.javax.ws.rs-api}
+
+
+ org.jboss.spec.javax.interceptor
+ jboss-interceptors-api_1.2_spec
+ ${version.jboss}
+
+
+ org.slf4j
+ slf4j-api
javax.json
@@ -62,6 +94,24 @@
jboss-websocket-api_1.1_spec
provided
+
+ org.jboss.arquillian.junit
+ arquillian-junit-core
+ ${version.arquillian}
+ test
+
+
+ org.jboss.shrinkwrap
+ shrinkwrap-api
+ ${version.jboss.shrinkwrap}
+ test
+
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
${project.artifactId}
diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml
index d7545595370..5335dced987 100644
--- a/web-services/query/pom.xml
+++ b/web-services/query/pom.xml
@@ -10,10 +10,14 @@
ejb
${project.artifactId}
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+
com.google.code.gson
gson
- 2.9.0
+ ${version.googlecode-gson}
com.google.guava
@@ -24,8 +28,22 @@
protobuf-java
- commons-configuration
- commons-configuration
+ commons-cli
+ commons-cli
+
+
+ commons-collections
+ commons-collections
+ ${version.commons-collections}
+
+
+ commons-lang
+ commons-lang
+
+
+ dnsjava
+ dnsjava
+ ${version.dnsjava}
gov.nsa.datawave
@@ -46,61 +64,148 @@
- gov.nsa.datawave
- datawave-ingest-configuration
- ${project.version}
- true
+ gov.nsa.datawave.microservice
+ accumulo-api
- gov.nsa.datawave
- datawave-ingest-core
- ${project.version}
-
-
- org.apache.logging.log4j
- log4j-slf4j-impl
-
-
+ 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-metric-api
+
+ gov.nsa.datawave.microservice
+ type-utils
+
+
+ log4j
+ log4j
+
+
+ org.slf4j
+ slf4j-log4j12
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
gov.nsa.datawave.webservices
datawave-ws-client
${project.version}
+
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
+
io.protostuff
protostuff-api
io.protostuff
- protostuff-collectionschema
+ protostuff-core
io.protostuff
protostuff-runtime
-
+ accumulo-core
+
+
+ org.apache.commons
+ commons-collections4
+
org.apache.commons
commons-jexl3
org.apache.commons
- commons-math3
- 3.0
- jar
+ commons-lang3
+ ${version.commons-lang3}
+
+
+ org.apache.deltaspike.core
+ deltaspike-core-api
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ ${version.hadoop}
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
+ org.apache.logging.log4j
+ log4j-1.2-api
org.easymock
easymock
+
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.3_spec
+ ${version.jboss}
+
org.powermock
powermock-api-easymock
@@ -109,13 +214,26 @@
org.powermock
powermock-module-junit4
+
+ org.slf4j
+ slf4j-api
+
+
+ org.springframework
+ spring-beans
+
org.springframework
spring-context
org.springframework
- spring-expression
+ spring-core
+
+
+ org.wildfly.security
+ wildfly-elytron
+ ${version.wildfly-elytron}
com.fasterxml.jackson.core
@@ -148,6 +266,12 @@
datawave-ws-common-util
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
gov.nsa.datawave.webservices
@@ -160,6 +284,12 @@
cdi-api
provided
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+ provided
+
org.apache.commons
commons-configuration2
@@ -234,6 +364,12 @@
datawave-in-memory-accumulo
test
+
+ javax.servlet
+ servlet-api
+ ${version.javax.servlet-api}
+ test
+
junit
junit
@@ -244,6 +380,30 @@
javassist
test
+
+ org.powermock
+ powermock-api-support
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
+
+ xml-apis
+ xml-apis
+ ${version.xml-apis}
+ test
+
${project.artifactId}
diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml
index 55c8e8927e2..f608ffefba9 100644
--- a/web-services/rest-api/pom.xml
+++ b/web-services/rest-api/pom.xml
@@ -9,23 +9,7 @@
datawave-ws-rest-api
war
${project.artifactId}
-
-
- org.jboss.resteasy
- resteasy-jsapi
-
-
- javax
- javaee-web-api
- 8.0
- provided
-
-
- junit
- junit
- test
-
-
+
${project.artifactId}
diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml
index 91be124d025..bdb0555906a 100644
--- a/web-services/security/pom.xml
+++ b/web-services/security/pom.xml
@@ -11,62 +11,127 @@
${project.artifactId}
- com.fasterxml.jackson.datatype
- jackson-datatype-guava
+ com.fasterxml.jackson.core
+ jackson-databind
+ compile
- com.spotify
- dns
+ com.fasterxml.jackson.datatype
+ jackson-datatype-guava
- commons-beanutils
- commons-beanutils
+ com.google.guava
+ guava
+ compile
- commons-cli
- commons-cli
+ gov.nsa.datawave
+ datawave-core
+ compile
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
- commons-collections
- commons-collections
+ gov.nsa.datawave.microservice
+ authorization-api
- commons-configuration
- commons-configuration
+ gov.nsa.datawave.microservice
+ base-rest-responses
+ compile
gov.nsa.datawave.microservice
- authorization-api
+ common-utils
+ compile
gov.nsa.datawave.webservices
datawave-ws-client
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
gov.nsa.datawave.webservices
datawave-ws-common-util
${project.version}
+
+
+ org.apache.hadoop
+ hadoop-common
+
+
+
+
+ io.dropwizard.metrics
+ metrics-core
+ ${version.dropwizard-metrics}
+ compile
+
+
+ io.undertow
+ undertow-core
+ ${version.undertow-core}
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ ${version.jakarta.annotation-api}
+ compile
+
+
+ jakarta.xml.bind
+ jakarta.xml.bind-api
+ ${version.jakarta.xml.bind-api}
+ compile
javax.enterprise
cdi-api
+
+ javax.inject
+ javax.inject
+ ${version.javax.inject}
+ compile
+
+
+ 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.commons
- commons-digester3
-
-
- org.apache.curator
- curator-framework
+ commons-collections4
+ compile
- org.apache.curator
- curator-recipes
+ org.apache.commons
+ commons-lang3
+ ${version.commons-lang3}
org.apache.curator
@@ -76,22 +141,43 @@
org.apache.deltaspike.core
deltaspike-core-api
+
+ org.apache.hadoop
+ hadoop-client-api
+
org.apache.httpcomponents
httpclient
- org.bouncycastle
- bcprov-jdk16
+ org.apache.httpcomponents
+ httpcore
+ compile
org.easymock
easymock
+
+ org.infinispan
+ infinispan-commons
+ compile
+
org.infinispan
infinispan-core
+
+ org.jboss.logging
+ jboss-logging
+ ${version.jboss.logging}
+ compile
+
+
+ org.jboss.xnio
+ xnio-api
+ ${version.jboss.xnio}
+
org.powermock
powermock-api-easymock
@@ -100,6 +186,16 @@
org.powermock
powermock-module-junit4
+
+ org.slf4j
+ slf4j-api
+ compile
+
+
+ org.springframework
+ spring-context
+ compile
+
com.fasterxml.jackson.module
jackson-module-jaxb-annotations
@@ -115,6 +211,30 @@
datawave-ws-common
${project.version}
provided
+
+
+ org.apache.hadoop
+ hadoop-client-api
+
+
+
+
+ io.dropwizard.metrics
+ metrics-annotation
+ ${version.dropwizard-metrics}
+ provided
+
+
+ io.undertow
+ undertow-servlet
+ ${version.undertow-servlet}
+ provided
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+ provided
org.apache.commons
@@ -151,6 +271,12 @@
resteasy-jaxrs
provided
+
+ org.jboss.spec.javax.annotation
+ jboss-annotations-api_1.2_spec
+ ${version.jboss}
+ provided
+
org.jboss.spec.javax.annotation
jboss-annotations-api_1.3_spec
@@ -176,6 +302,18 @@
jboss-jacc-api_1.5_spec
provided
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_3.1_spec
+ ${version.jboss}
+ provided
+
+
+ org.jboss.spec.javax.servlet
+ jboss-servlet-api_4.0_spec
+ ${version.jboss-servlet-api-4.0}
+ provided
+
org.jboss.spec.javax.transaction
jboss-transaction-api_1.2_spec
@@ -206,11 +344,32 @@
wildfly-undertow
provided
+
+ org.wildfly.security
+ wildfly-elytron
+ ${version.wildfly-elytron}
+ provided
+
+
+ commons-io
+ commons-io
+ test
+
gov.nsa.datawave
datawave-in-memory-accumulo
test
+
+ gov.nsa.datawave.microservice
+ accumulo-api
+ test
+
+
+ gov.nsa.datawave.microservice
+ dictionary-api
+ test
+
gov.nsa.datawave.webservices
datawave-ws-common
@@ -229,6 +388,11 @@
javassist
test
+
+ org.jboss.arquillian.container
+ arquillian-container-test-api
+ test
+
org.jboss.arquillian.container
arquillian-weld-ee-embedded-1.1
@@ -239,6 +403,16 @@
arquillian-junit-container
test
+
+ org.jboss.arquillian.junit
+ arquillian-junit-core
+ test
+
+
+ org.jboss.shrinkwrap
+ shrinkwrap-api
+ test
+
org.jboss.weld
weld-core
@@ -249,11 +423,29 @@
weld-core-impl
test
+
+ org.powermock
+ powermock-core
+ ${version.powermock}
+ test
+
+
+ org.powermock
+ powermock-reflect
+ ${version.powermock}
+ test
+
org.springframework
spring-expression
test
+
+ org.wildfly.common
+ wildfly-common
+ ${version.wildfly-common}
+ test
+
${project.artifactId}