From 2a2438eb669f7c7091aee9422d753ef36284b8ea Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Wed, 25 Jan 2023 21:03:25 +0000 Subject: [PATCH 1/3] 1822 - clean up used undeclared dependencies --- common-test/pom.xml | 4 + pom.xml | 31 +- warehouse/accumulo-extensions/pom.xml | 13 + warehouse/assemble/webservice/pom.xml | 13 + warehouse/core/pom.xml | 91 +++++- warehouse/data-dictionary-core/pom.xml | 10 +- warehouse/edge-dictionary-core/pom.xml | 10 +- warehouse/index-stats/pom.xml | 33 ++ warehouse/ingest-configuration/pom.xml | 11 +- warehouse/ingest-core/pom.xml | 174 +++++++++- .../java/datawave/util/flag/IngestWorker.java | 4 +- warehouse/ingest-csv/pom.xml | 71 ++++- warehouse/ingest-json/pom.xml | 35 +- warehouse/ingest-nyctlc/pom.xml | 42 +++ warehouse/ingest-wikipedia/pom.xml | 50 ++- warehouse/metrics-core/pom.xml | 41 +++ warehouse/ops-tools/config-compare/pom.xml | 4 +- warehouse/ops-tools/index-validation/pom.xml | 14 +- warehouse/query-core/pom.xml | 300 ++++++++++++++++++ web-services/accumulo/pom.xml | 45 +++ web-services/atom/pom.xml | 46 +++ web-services/cached-results/pom.xml | 91 ++++++ web-services/client/pom.xml | 36 ++- web-services/common-util/pom.xml | 53 ++++ web-services/common/pom.xml | 143 ++++++++- web-services/dictionary/pom.xml | 56 +++- web-services/examples/client-login/pom.xml | 17 +- web-services/examples/http-client/pom.xml | 7 +- web-services/map-reduce-embedded/pom.xml | 44 +++ web-services/map-reduce-status/pom.xml | 33 ++ web-services/map-reduce/pom.xml | 104 ++++++ web-services/model/pom.xml | 77 +++++ web-services/modification/pom.xml | 67 ++++ web-services/query-websocket/pom.xml | 188 ++++++++++- web-services/query/pom.xml | 210 +++++++++++- web-services/security/pom.xml | 190 +++++++++++ 36 files changed, 2322 insertions(+), 36 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index aef4f88263a..c312d14d64a 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -17,6 +17,10 @@ gov.nsa.datawave datawave-in-memory-accumulo + + org.apache.accumulo + accumulo-core + org.apache.accumulo accumulo-server-base diff --git a/pom.xml b/pom.xml index 7ac5086a37a..8b3acd792ea 100644 --- a/pom.xml +++ b/pom.xml @@ -47,18 +47,25 @@ 2.6 2.1.1 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 4.0.2 2.15.0 + 8.1.1 2.22.1 28.1 1.2.0 31.1-jre 2.0.3 + 2.9.0 1.1.1 3.3.5 1.1.1 @@ -67,13 +74,27 @@ 3.0.1 9.4.21.Final 2.10.0.pr1 + 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 1.19.0 4.13.2 5.5.2 @@ -100,6 +121,7 @@ 8.0.16 4.1.42.Final 2.1 + 2.3 5.0.3.Final 2.0.9 3.7.1 @@ -111,14 +133,19 @@ 2.9.6 3.0.0-M6 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.0.3 3.1.4 2.12.2 + 1.4.01 3.8.1 @@ -1411,7 +1438,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.4.0 org.apache.maven.plugins @@ -2143,4 +2170,4 @@ - + \ No newline at end of file diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml index a4492b380c6..0c9198d4d90 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -24,11 +24,24 @@ org.apache.hadoop hadoop-client-api + ${version.hadoop} org.apache.hadoop hadoop-client-runtime + + org.apache.hadoop + hadoop-common + + + org.apache.logging.log4j + log4j-1.2-api + + + org.slf4j + slf4j-api + com.fasterxml.woodstox woodstox-core diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 185de0bba0e..9bcfb3cb0a9 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -21,6 +21,15 @@ gov.nsa.datawave datawave-query-core + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + org.apache.hadoop hadoop-client-api @@ -29,6 +38,10 @@ org.apache.hadoop hadoop-client-runtime + + org.apache.hadoop + hadoop-mapreduce-client-core + org.powermock powermock-api-easymock diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 13d1410925c..ed8b2aeb6f4 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -31,6 +31,10 @@ caffeine ${version.caffeine} + + com.google.guava + guava + com.google.protobuf protobuf-java @@ -43,6 +47,14 @@ commons-cli commons-cli + + commons-codec + commons-codec + + + commons-lang + commons-lang + gov.nsa.datawave datawave-common @@ -70,19 +82,37 @@ + + gov.nsa.datawave.microservice + type-utils + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + io.protostuff protostuff-api - javax.annotation - javax.annotation-api - 1.3.2 + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} javax.enterprise cdi-api + + javax.inject + javax.inject + junit junit @@ -90,7 +120,7 @@ net.sf.opencsv opencsv - 2.3 + ${version.opencsv} org.apache.accumulo @@ -108,6 +138,11 @@ org.apache.curator curator-client + + org.apache.curator + curator-framework + ${version.curator} + org.apache.curator curator-recipes @@ -119,6 +154,7 @@ org.apache.hadoop hadoop-client + ${version.hadoop} org.apache.hadoop @@ -134,6 +170,19 @@ + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-mapreduce-client-core + org.apache.logging.log4j log4j-1.2-api @@ -150,6 +199,29 @@ org.apache.logging.log4j log4j-slf4j-impl + + org.apache.zookeeper + zookeeper + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.zookeeper + zookeeper-jute + ${version.zookeeper} + + + org.slf4j + slf4j-api + org.slf4j slf4j-api @@ -166,6 +238,11 @@ xerces xercesImpl + + xml-apis + xml-apis + ${version.xml-apis} + org.apache.accumulo accumulo-server-base @@ -198,6 +275,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 48ac3a4f434..43601730c0d 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 5fabf8644d6..854ab49d4b5 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 a32dca5b6be..1eaba1ff90f 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -14,6 +14,14 @@ com.clearspring.analytics stream + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + gov.nsa.datawave datawave-ingest-core @@ -24,6 +32,31 @@ datawave-query-core ${project.version} + + gov.nsa.datawave.microservice + common-utils + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + org.apache.logging.log4j + log4j-1.2-api + com.fasterxml.woodstox woodstox-core diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index d3134bbb80c..751812fbbc0 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -16,7 +16,16 @@ javax.mail javax.mail-api - 1.5.4 + ${version.javax.mail-api} + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index b04b804446a..ed6a733498f 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -14,6 +14,22 @@ com.clearspring.analytics stream + + com.google.code.findbugs + jsr305 + + + com.google.code.gson + gson + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + com.sun.xml.bind jaxb-impl @@ -23,34 +39,107 @@ com.timgroup java-statsd-client + + commons-cli + commons-cli + + + commons-codec + commons-codec + + + commons-collections + commons-collections + commons-collections commons-collections + + commons-io + commons-io + + + commons-lang + commons-lang + + + commons-logging + commons-logging + gov.nsa.datawave datawave-accumulo-extensions ${project.version} + + gov.nsa.datawave + datawave-common-test + 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 + + gov.nsa.datawave.webservices datawave-ws-common-util ${project.version} + + it.unimi.dsi + fastutil + ${version.fastutil} + jakarta.xml.bind jakarta.xml.bind-api - 2.3.3 + ${version.jakarta.xml.bind-api} jline jline - 2.12 + ${version.jline} + + + org.apache.accumulo + accumulo-core org.apache.accumulo @@ -60,14 +149,40 @@ org.apache.accumulo accumulo-server-base + + org.apache.commons + commons-collections4 + org.apache.commons commons-jexl + + org.apache.commons + commons-lang3 + org.apache.hadoop hadoop-annotations + + org.apache.hadoop + hadoop-client + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-client-runtime + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + org.apache.hadoop hadoop-distcp @@ -104,6 +219,10 @@ org.apache.lucene lucene-core + + org.apache.zookeeper + zookeeper + org.easymock easymock @@ -112,6 +231,11 @@ org.infinispan infinispan-commons + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -128,6 +252,27 @@ org.slf4j slf4j-api + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-jcl + + + xerces + xercesImpl + + + xml-apis + xml-apis + ${version.xml-apis} + io.dropwizard.metrics metrics-core @@ -183,7 +328,7 @@ javax.mail javax.mail-api - 1.5.4 + ${version.javax.mail-api} test @@ -197,11 +342,34 @@ ${version.accumulo} 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 + 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 1ec8f6f6977..9667f9a544d 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -10,6 +10,18 @@ jar ${project.artifactId} + + com.google.guava + guava + + + commons-io + commons-io + + + commons-lang + commons-lang + gov.nsa.datawave datawave-core @@ -25,11 +37,56 @@ datawave-ingest-core ${project.version} + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.microservice + metadata-utils + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + gov.nsa.datawave.microservice + type-utils + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + gov.nsa.datawave.webservices datawave-ws-common-util ${project.version} + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + org.apache.hadoop hadoop-distcp @@ -42,6 +99,10 @@ org.apache.hadoop hadoop-mapreduce-client-core + + org.apache.logging.log4j + log4j-1.2-api + org.apache.lucene lucene-analyzers-common @@ -71,6 +132,14 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + + + xerces + xercesImpl + com.fasterxml.woodstox woodstox-core @@ -101,7 +170,7 @@ javax.mail javax.mail-api - 1.5.4 + ${version.javax.mail-api} test diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 495e83deda2..9ef0d3b34c1 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 @@ -35,6 +47,23 @@ datawave-ws-common-util ${project.version} + + org.apache.accumulo + accumulo-core + + + org.apache.commons + commons-collections4 + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + org.apache.hadoop hadoop-distcp @@ -47,6 +76,10 @@ org.apache.hadoop hadoop-mapreduce-client-core + + org.apache.logging.log4j + log4j-1.2-api + org.apache.lucene lucene-analyzers-common @@ -106,7 +139,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 098f08893db..50b2bb73546 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -10,10 +10,47 @@ 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-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + org.apache.logging.log4j + log4j-1.2-api + + + org.locationtech.jts + jts-core + + + org.slf4j + slf4j-api + com.fasterxml.woodstox woodstox-core @@ -36,6 +73,11 @@ datawave-query-core test + + junit + junit + test + diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index f4146c82482..f0838cb12e3 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -10,6 +10,14 @@ jar ${project.artifactId} + + com.google.guava + guava + + + commons-lang + commons-lang + gov.nsa.datawave datawave-core @@ -22,10 +30,41 @@ gov.nsa.datawave datawave-ingest-core + + gov.nsa.datawave.microservice + common-utils + + + gov.nsa.datawave.microservice + type-utils + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + + gov.nsa.datawave.webservices datawave-ws-common-util + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + org.apache.hadoop hadoop-distcp @@ -38,6 +77,10 @@ org.apache.hadoop hadoop-mapreduce-client-core + + org.apache.logging.log4j + log4j-1.2-api + org.apache.lucene lucene-analyzers-common @@ -62,6 +105,11 @@ org.powermock powermock-module-junit4 + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.woodstox woodstox-core @@ -91,7 +139,7 @@ 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 90fdc48b0ca..ee32b240abb 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -18,10 +18,22 @@ com.google.guava guava + + commons-cli + commons-cli + commons-configuration commons-configuration + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + gov.nsa.datawave datawave-ingest-core @@ -30,10 +42,39 @@ gov.nsa.datawave datawave-query-core + + gov.nsa.datawave.microservice + common-utils + javax.enterprise cdi-api + + org.apache.accumulo + accumulo-core + + + org.apache.accumulo + accumulo-hadoop-mapreduce + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + org.apache.logging.log4j + log4j-1.2-api + org.easymock easymock diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index a8848366e0f..a3db94a758c 100644 --- a/warehouse/ops-tools/config-compare/pom.xml +++ b/warehouse/ops-tools/config-compare/pom.xml @@ -55,8 +55,8 @@ org.hamcrest hamcrest-all - 1.3 + ${version.hamcrest} test - + \ No newline at end of file diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 14f56fff9e4..95ed06530d1 100644 --- a/warehouse/ops-tools/index-validation/pom.xml +++ b/warehouse/ops-tools/index-validation/pom.xml @@ -18,6 +18,10 @@ commons-logging commons-logging + + gov.nsa.datawave.contrib + datawave-in-memory-accumulo + org.apache.accumulo accumulo-core @@ -54,6 +58,14 @@ hadoop-client-runtime ${version.hadoop} + + org.apache.hadoop + hadoop-common + + + org.apache.logging.log4j + log4j-1.2-api + org.apache.zookeeper zookeeper @@ -76,7 +88,7 @@ org.hamcrest hamcrest-all - 1.3 + ${version.hamcrest} test diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index e8d349d2427..e136e8b0526 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.datatype + jackson-datatype-guava + + + com.github.ben-manes.caffeine + caffeine + ${version.caffeine} + com.google.code.findbugs annotations @@ -38,27 +51,100 @@ com.google.guava guava + + com.google.protobuf + protobuf-java + com.googlecode.json-simple json-simple + + com.timgroup + java-statsd-client + + + commons-cli + commons-cli + + + commons-codec + commons-codec + + + commons-collections + commons-collections + ${version.commons-collections} + commons-configuration commons-configuration + + 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-ingest-core + + + gov.nsa.datawave.contrib + datawave-in-memory-accumulo + + + gov.nsa.datawave.microservice + accumulo-utils + + + 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.slf4j + slf4j-log4j12 + org.apache.hadoop hadoop-common @@ -69,6 +155,10 @@ gov.nsa.datawave.microservice query-metric-api + + gov.nsa.datawave.microservice + type-utils + gov.nsa.datawave.webservices datawave-ws-client @@ -89,14 +179,53 @@ ${project.version} ejb + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + io.dropwizard.metrics metrics-core + + 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.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + + + javax.xml.bind + jaxb-api + ${version.javax.jaxb-api} + + + net.sf.opencsv + opencsv + ${version.opencsv} + org.apache.accumulo accumulo-core @@ -107,14 +236,64 @@ + + org.apache.commons + commons-collections4 + org.apache.commons commons-jexl + + 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-common + ${version.hadoop} + + + com.sun.jersey + jersey-server + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + org.apache.httpcomponents httpclient @@ -123,14 +302,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 @@ -151,10 +342,91 @@ org.javatuples javatuples + + org.jboss.arquillian.container + arquillian-container-test-api + + + org.jboss.resteasy + jaxrs-api + ${version.jboss.resteasy} + org.jboss.resteasy resteasy-jaxrs + + org.jboss.shrinkwrap + shrinkwrap-api + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + + + 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.ow2.asm asm @@ -163,10 +435,24 @@ org.powermock powermock-api-easymock + + org.powermock + powermock-core + ${version.powermock} + org.powermock powermock-module-junit4 + + org.powermock + powermock-reflect + ${version.powermock} + + + org.slf4j + slf4j-api + org.springframework spring-beans @@ -179,6 +465,15 @@ org.springframework spring-core + + org.springframework + spring-jcl + + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.woodstox woodstox-core @@ -293,6 +588,11 @@ arquillian-junit-container test + + org.jboss.arquillian.junit + arquillian-junit-core + test + org.jboss.logging jboss-logging diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index 9bd6aa0257f..d2cd0991c83 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -10,10 +10,18 @@ ejb ${project.artifactId} + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.module jackson-module-jaxb-annotations + + com.google.guava + guava + commons-configuration commons-configuration @@ -31,6 +39,10 @@ gov.nsa.datawave.microservice accumulo-api + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice base-rest-responses @@ -61,6 +73,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 @@ -70,6 +102,19 @@ 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 woodstox-core diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 2c719276668..960c59e9cc4 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -10,6 +10,14 @@ ejb ${project.artifactId} + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.microservice + base-rest-responses + gov.nsa.datawave.webservices datawave-ws-common @@ -20,6 +28,21 @@ datawave-ws-common-util ${project.version} + + 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 @@ -33,6 +56,10 @@ org.apache.abdera abdera-parser + + org.apache.accumulo + accumulo-core + org.apache.deltaspike.core deltaspike-core-api @@ -44,11 +71,20 @@ org.apache.hadoop hadoop-client-api + ${version.hadoop} org.apache.hadoop hadoop-client-runtime + + org.apache.hadoop + hadoop-common + + + org.apache.logging.log4j + log4j-1.2-api + org.apache.ws.commons.axiom axiom-api @@ -57,6 +93,11 @@ org.apache.ws.commons.axiom axiom-impl + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + com.fasterxml.woodstox woodstox-core @@ -97,6 +138,11 @@ jboss-transaction-api_1.2_spec provided + + junit + junit + test + ${project.artifactId} diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index 161d35e4fac..7123d113713 100644 --- a/web-services/cached-results/pom.xml +++ b/web-services/cached-results/pom.xml @@ -26,14 +26,68 @@ gov.nsa.datawave datawave-core + + 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 + + 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.enterprise cdi-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.commons commons-collections4 @@ -42,18 +96,49 @@ org.apache.commons commons-jexl + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + 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 + + org.powermock + powermock-core + ${version.powermock} + org.powermock powermock-module-junit4 + + org.springframework + spring-core + gov.nsa.datawave.webservices datawave-ws-client @@ -124,6 +209,12 @@ javassist 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 1c434a31e81..3953e148a21 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -55,6 +55,10 @@ gov.nsa.datawave.microservice dictionary-api + + gov.nsa.datawave.microservice + metadata-utils + gov.nsa.datawave.microservice type-utils @@ -101,10 +105,20 @@ io.protostuff protostuff-yaml + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + java3d vecmath + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + org.apache.accumulo accumulo-core @@ -121,10 +135,24 @@ org.apache.hadoop hadoop-client-runtime + + 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.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -133,6 +161,10 @@ org.powermock powermock-module-junit4 + + org.springframework + spring-core + xerces xercesImpl @@ -235,8 +267,8 @@ lib runtime + compile provided - test @@ -364,4 +396,4 @@ - + \ No newline at end of file diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 4b4c7cc541b..15c67b37c0b 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -39,6 +39,10 @@ gov.nsa.datawave.microservice authorization-api + + gov.nsa.datawave.microservice + base-rest-responses + gov.nsa.datawave.microservice query-metric-api @@ -64,6 +68,31 @@ io.protostuff protostuff-yaml + + 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.commons + commons-lang3 + ${version.commons-lang3} + org.apache.deltaspike.core deltaspike-core-api @@ -76,6 +105,11 @@ org.apache.hadoop hadoop-client-api + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + org.apache.hadoop hadoop-client-runtime @@ -84,6 +118,10 @@ org.apache.hadoop.thirdparty hadoop-shaded-guava + + org.apache.logging.log4j + log4j-1.2-api + org.easymock easymock @@ -108,6 +146,16 @@ org.jboss.spec.javax.servlet jboss-servlet-api_4.0_spec + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -116,6 +164,11 @@ org.powermock powermock-module-junit4 + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.jackson.core jackson-annotations diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index ff3538043fd..5e33a5cf721 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -19,6 +19,14 @@ com.clearspring.analytics stream + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.datatype jackson-datatype-guava @@ -39,10 +47,46 @@ commons-configuration commons-configuration + + commons-lang + commons-lang + + + dnsjava + dnsjava + ${version.dnsjava} + gov.nsa.datawave + datawave-common + ${project.version} + + + gov.nsa.datawave + datawave-core + + + gov.nsa.datawave.contrib 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 +95,10 @@ gov.nsa.datawave.microservice authorization-api + + gov.nsa.datawave.microservice + base-rest-responses + gov.nsa.datawave.microservice metrics-reporter @@ -59,6 +107,11 @@ gov.nsa.datawave.microservice query-metric-api + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} + gov.nsa.datawave.webservices datawave-ws-common-util @@ -68,6 +121,16 @@ io.astefanutti.metrics.cdi metrics-cdi + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + ${version.dropwizard-metrics} + io.jsonwebtoken jjwt-impl @@ -76,18 +139,47 @@ io.jsonwebtoken jjwt-jackson + + 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 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 @@ -121,10 +213,35 @@ org.apache.zookeeper zookeeper + + org.apache.zookeeper + zookeeper-jute + ${version.zookeeper} + org.easymock easymock + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + ${version.jboss} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${version.jboss-servlet-api-4.0} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -133,10 +250,18 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + org.springframework spring-aop + + org.springframework + spring-beans + org.springframework spring-context @@ -145,6 +270,10 @@ org.springframework spring-context-support + + org.springframework + spring-core + com.fasterxml.jackson.core jackson-core @@ -255,6 +384,12 @@ javassist test + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-test diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 40b9205f76a..3fc61a0c500 100644 --- a/web-services/dictionary/pom.xml +++ b/web-services/dictionary/pom.xml @@ -10,6 +10,11 @@ ejb ${project.artifactId} + + dnsjava + dnsjava + ${version.dnsjava} + gov.nsa.datawave datawave-data-dictionary-core @@ -20,6 +25,55 @@ datawave-edge-dictionary-core ${project.version} + + gov.nsa.datawave + datawave-query-core + ${project.version} + + + 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.resteasy + jaxrs-api + ${version.jboss.resteasy} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + ${version.jboss} + + + org.jboss.spec.javax.ejb + jboss-ejb-api_3.2_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + ${project.artifactId} @@ -39,4 +93,4 @@ - + \ No newline at end of file diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 95556c5e4af..8cd68938571 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 394b66954f0..af162b3eee1 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 a6ee0cd6809..635d6777494 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -10,20 +10,64 @@ jar ${project.artifactId} + + commons-codec + commons-codec + + + commons-lang + commons-lang + + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.webservices datawave-ws-common ${project.version} + + gov.nsa.datawave.webservices + datawave-ws-common-util + ${project.version} + gov.nsa.datawave.webservices datawave-ws-security ${project.version} + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api + + 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.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + org.jboss.spec.javax.annotation jboss-annotations-api_1.3_spec diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 7616f4276e9..ae60fa62a4f 100644 --- a/web-services/map-reduce-status/pom.xml +++ b/web-services/map-reduce-status/pom.xml @@ -10,15 +10,48 @@ ejb ${project.artifactId} + + gov.nsa.datawave.microservice + base-rest-responses + gov.nsa.datawave.webservices datawave-ws-security ${project.version} + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + + + org.apache.logging.log4j + log4j-1.2-api + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + gov.nsa.datawave.webservices datawave-ws-client diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 5cd431de063..b8b0d63e19a 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -10,22 +10,83 @@ ejb ${project.artifactId} + + com.google.guava + guava + + + commons-codec + commons-codec + commons-configuration commons-configuration + + commons-lang + commons-lang + + + 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 + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + javax.enterprise cdi-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-client-api + ${version.hadoop} + org.apache.hadoop hadoop-client-api @@ -46,6 +107,10 @@ org.apache.hadoop.thirdparty hadoop-shaded-protobuf_3_7 + + org.apache.logging.log4j + log4j-1.2-api + org.apache.oozie oozie-client @@ -62,6 +127,21 @@ org.easymock easymock + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.jboss.weld.se weld-se-core @@ -74,14 +154,32 @@ org.powermock powermock-api-easymock + + org.powermock + powermock-core + ${version.powermock} + org.powermock powermock-module-junit4 + + org.powermock + powermock-reflect + ${version.powermock} + org.slf4j slf4j-api + + org.springframework + spring-context + + + org.springframework + spring-core + com.fasterxml.woodstox woodstox-core @@ -174,6 +272,12 @@ junit test + + org.powermock + powermock-api-support + ${version.powermock} + test + org.springframework spring-expression diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 982a8dc993f..84d6984533e 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -26,14 +26,80 @@ commons-configuration commons-configuration + + commons-lang + commons-lang + + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.microservice + authorization-api + + + gov.nsa.datawave.microservice + base-rest-responses + + + gov.nsa.datawave.microservice + metadata-utils + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + javax.enterprise cdi-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.hadoop + hadoop-common + + + 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.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -42,6 +108,11 @@ org.powermock powermock-module-junit4 + + org.powermock + powermock-reflect + ${version.powermock} + com.fasterxml.woodstox woodstox-core @@ -133,6 +204,12 @@ javassist test + + org.powermock + powermock-core + ${version.powermock} + test + ${project.artifactId} diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index 0c000c154b1..aa949246eb3 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -14,15 +14,82 @@ UTF-8 + + gov.nsa.datawave + datawave-core + gov.nsa.datawave datawave-query-core ${project.version} + + 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.enterprise cdi-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.hadoop + hadoop-common + + + org.apache.logging.log4j + log4j-1.2-api + + + org.jboss.resteasy + jaxrs-api + ${version.jboss.resteasy} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + gov.nsa.datawave.webservices datawave-ws-client diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index 6fa5b91f00c..3a5f9bbb61a 100644 --- a/web-services/query-websocket/pom.xml +++ b/web-services/query-websocket/pom.xml @@ -10,6 +10,22 @@ war ${project.artifactId} + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.core jackson-databind @@ -18,11 +34,49 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations + + com.google.guava + guava + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + + + gov.nsa.datawave.microservice + base-rest-responses + + + gov.nsa.datawave.microservice + base-rest-responses + + + gov.nsa.datawave.microservice + base-rest-responses + + + gov.nsa.datawave.microservice + common-utils + + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} + gov.nsa.datawave.webservices datawave-ws-common ${project.version} + + gov.nsa.datawave.webservices + datawave-ws-common-util + ${project.version} + gov.nsa.datawave.webservices datawave-ws-query @@ -33,10 +87,124 @@ datawave-ws-security ${project.version} + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + ${version.dropwizard-metrics} + + + io.undertow + undertow-core + ${version.undertow-core} + + + io.undertow + undertow-servlet + ${version.undertow-servlet} + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + + + org.apache.commons + commons-lang3 + ${version.commons-lang3} + + + org.apache.hadoop + hadoop-common + + + org.apache.httpcomponents + httpcore + + + org.infinispan + infinispan-commons + + + org.jboss.arquillian.container + arquillian-container-test-api + ${version.arquillian} + + + org.jboss.arquillian.container + arquillian-container-test-api + + + org.jboss.logging + jboss-logging + ${version.jboss.logging} + + + org.jboss.spec.javax.interceptor + jboss-interceptors-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${version.jboss-servlet-api-4.0} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.xnio + xnio-api + ${version.jboss.xnio} + + + org.powermock + powermock-reflect + ${version.powermock} + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-api + javax.json javax.json-api @@ -62,6 +230,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} @@ -86,4 +272,4 @@ - + \ No newline at end of file diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 74a36752760..cd68743f0a2 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -13,7 +13,7 @@ com.google.code.gson gson - 2.9.0 + ${version.googlecode-gson} com.google.guava @@ -23,10 +23,32 @@ com.google.protobuf protobuf-java + + commons-cli + commons-cli + + + commons-collections + commons-collections + ${version.commons-collections} + commons-configuration commons-configuration + + commons-lang + commons-lang + + + commons-lang + commons-lang + + + dnsjava + dnsjava + ${version.dnsjava} + gov.nsa.datawave datawave-core @@ -62,15 +84,71 @@ + + 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-metric-api + + gov.nsa.datawave.microservice + query-metric-api + + + gov.nsa.datawave.microservice + type-utils + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + gov.nsa.datawave.webservices datawave-ws-client ${project.version} + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + ${version.dropwizard-metrics} + io.protostuff protostuff-api @@ -79,14 +157,56 @@ io.protostuff protostuff-collectionschema + + io.protostuff + protostuff-core + io.protostuff protostuff-runtime - + accumulo-core + + + org.apache.commons + commons-collections4 + org.apache.commons commons-jexl @@ -94,13 +214,53 @@ org.apache.commons commons-math3 - 3.0 + ${version.commons-math3} jar + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.apache.logging.log4j + log4j-1.2-api + org.easymock easymock + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + ${version.jboss} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + org.powermock powermock-api-easymock @@ -109,14 +269,36 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + + + org.springframework + spring-beans + org.springframework spring-context + + org.springframework + spring-core + org.springframework spring-expression + + org.wildfly.security + wildfly-elytron + ${version.wildfly-elytron} + + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.jackson.core jackson-core @@ -230,6 +412,24 @@ javassist test + + org.powermock + powermock-api-support + ${version.powermock} + test + + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + ${project.artifactId} diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 26fcb74f391..ec30c131b5e 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -10,10 +10,18 @@ ejb ${project.artifactId} + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.datatype jackson-datatype-guava + + com.google.guava + guava + com.spotify dns @@ -34,10 +42,39 @@ commons-configuration commons-configuration + + commons-io + commons-io + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + + + gov.nsa.datawave.microservice + accumulo-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 + ${version.microservice.dictionary-api} + gov.nsa.datawave.webservices datawave-ws-client @@ -48,18 +85,72 @@ datawave-ws-common-util ${project.version} + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + ${version.dropwizard-metrics} + + + io.undertow + undertow-core + ${version.undertow-core} + + + io.undertow + undertow-servlet + ${version.undertow-servlet} + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.servlet + servlet-api + ${version.javax.servlet-api} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + org.apache.accumulo accumulo-core + + org.apache.commons + commons-collections4 + org.apache.commons commons-digester3 + + org.apache.commons + commons-lang3 + ${version.commons-lang3} + org.apache.curator curator-framework @@ -76,10 +167,23 @@ org.apache.deltaspike.core deltaspike-core-api + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-common + org.apache.httpcomponents httpclient + + org.apache.httpcomponents + httpcore + org.bouncycastle bcprov-jdk16 @@ -88,10 +192,49 @@ org.easymock easymock + + org.infinispan + infinispan-commons + org.infinispan infinispan-core + + org.jboss.logging + jboss-logging + ${version.jboss.logging} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + ${version.jboss} + + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${version.jboss-servlet-api-4.0} + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + ${version.jboss} + + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + + + org.jboss.xnio + xnio-api + ${version.jboss.xnio} + org.powermock powermock-api-easymock @@ -100,6 +243,24 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + + + org.springframework + spring-context + + + org.wildfly.common + wildfly-common + ${version.wildfly-common} + + + org.wildfly.security + wildfly-elytron + ${version.wildfly-elytron} + com.fasterxml.jackson.module jackson-module-jaxb-annotations @@ -229,6 +390,12 @@ javassist test + + org.jboss.arquillian.container + arquillian-container-test-api + ${version.arquillian} + test + org.jboss.arquillian.container arquillian-weld-ee-embedded-1.1 @@ -239,6 +406,17 @@ arquillian-junit-container test + + org.jboss.arquillian.junit + arquillian-junit-core + ${version.arquillian} + test + + + org.jboss.shrinkwrap + shrinkwrap-api + test + org.jboss.weld weld-core @@ -249,6 +427,18 @@ weld-core-impl test + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-expression From d06965c8094e030672ae822e5af518f073381de6 Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Wed, 4 Oct 2023 17:51:20 +0000 Subject: [PATCH 2/3] builds --- web-services/common-util/pom.xml | 8 ++++++++ web-services/common/pom.xml | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 15c67b37c0b..a7277334bf3 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -88,6 +88,10 @@ javax.ws.rs-api ${version.javax.ws.rs-api} + + org.apache.commons + commons-collections4 + org.apache.commons commons-lang3 @@ -114,6 +118,10 @@ org.apache.hadoop hadoop-client-runtime + + org.apache.hadoop + hadoop-common + org.apache.hadoop.thirdparty hadoop-shaded-guava diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index 5e33a5cf721..123e608ab08 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -168,6 +168,10 @@ commons-collections4 ${version.commons-collections4} + + org.apache.commons + commons-collections4 + org.apache.commons commons-pool2 @@ -201,6 +205,10 @@ org.apache.hadoop hadoop-client-runtime + + org.apache.hadoop + hadoop-common + org.apache.httpcomponents httpclient From 68ce05cdc974d62f4d366c1719a4b2567ddaff5c Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Wed, 6 Dec 2023 20:01:12 +0000 Subject: [PATCH 3/3] revert annotation to javax.annotation-api instead of jakarta --- pom.xml | 3 ++- warehouse/core/pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8b3acd792ea..dbf93affc0c 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,7 @@ 3.24.0-GA 3.1.0 2.0.1.Final + 1.3.2 1 2.2.11 1.5.4 @@ -2170,4 +2171,4 @@ - \ No newline at end of file + diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index ed8b2aeb6f4..8cb60e57249 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -101,9 +101,9 @@ protostuff-api - jakarta.annotation - jakarta.annotation-api - ${version.jakarta.annotation-api} + javax.annotation + javax.annotation-api + ${version.javax.annotation-api} javax.enterprise