From 8bf956af9bcc3df0f2aabd991fe8c226381fc26e Mon Sep 17 00:00:00 2001 From: Christopher Gross Date: Wed, 18 Dec 2024 18:59:46 +0000 Subject: [PATCH 1/4] dependency analysis --- common-test/pom.xml | 12 +- core/cached-results/pom.xml | 25 ++ core/common/pom.xml | 51 ++- core/connection-pool/pom.xml | 79 +++- core/map-reduce/pom.xml | 45 +++ core/modification/pom.xml | 86 ++++- core/query/pom.xml | 118 +++++- docs/pom.xml | 6 - pom.xml | 77 +++- warehouse/accumulo-extensions/pom.xml | 30 +- warehouse/age-off/pom.xml | 5 + warehouse/assemble/webservice/pom.xml | 54 +-- warehouse/common/pom.xml | 26 +- warehouse/core/pom.xml | 147 ++++--- warehouse/index-stats/pom.xml | 64 +++- warehouse/ingest-configuration/pom.xml | 23 +- warehouse/ingest-core/pom.xml | 268 +++++++++++-- .../tokenize/TokenSearchSynonymFilter.java | 2 - .../java/datawave/util/flag/IngestWorker.java | 4 +- warehouse/ingest-csv/pom.xml | 147 ++++--- warehouse/ingest-json/pom.xml | 60 ++- warehouse/ingest-nyctlc/pom.xml | 65 +++- warehouse/ingest-ssdeep/pom.xml | 12 +- warehouse/ingest-wikipedia/pom.xml | 102 ++++- warehouse/metrics-core/pom.xml | 65 ++-- warehouse/ops-tools/config-compare/pom.xml | 31 -- warehouse/ops-tools/index-validation/pom.xml | 31 +- warehouse/pom.xml | 61 ++- warehouse/query-core/pom.xml | 361 ++++++++++++++++-- .../query/MaxExpansionIndexOnlyQueryTest.java | 2 - warehouse/ssdeep-common/pom.xml | 26 +- web-services/accumulo/pom.xml | 49 ++- web-services/atom/pom.xml | 81 +++- web-services/cached-results/pom.xml | 161 +++++++- web-services/client/pom.xml | 68 ++-- web-services/common-util/pom.xml | 103 ++--- web-services/common/pom.xml | 159 ++++++-- web-services/deploy/application/pom.xml | 10 + web-services/dictionary/pom.xml | 35 ++ web-services/examples/client-login/pom.xml | 15 + web-services/examples/http-client/pom.xml | 5 + web-services/map-reduce-status/pom.xml | 41 +- web-services/map-reduce/pom.xml | 129 ++++++- web-services/metrics/pom.xml | 118 ++++++ web-services/model/pom.xml | 100 ++++- web-services/modification/pom.xml | 49 ++- web-services/query-websocket/pom.xml | 56 ++- web-services/query/pom.xml | 213 +++++++++-- web-services/rest-api/pom.xml | 18 +- web-services/security/pom.xml | 258 +++++++++++-- 50 files changed, 2969 insertions(+), 784 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index dcf70ae2fbb..560a56f3a1e 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/core/cached-results/pom.xml b/core/cached-results/pom.xml index 7080f4c795a..2139ad2aef9 100644 --- a/core/cached-results/pom.xml +++ b/core/cached-results/pom.xml @@ -11,6 +11,23 @@ + + com.google.guava + guava + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + ${project.version} + + + gov.nsa.datawave.microservice + accumulo-utils + gov.nsa.datawave.microservice base-rest-responses @@ -44,5 +61,13 @@ + + org.apache.accumulo + accumulo-core + + + org.apache.logging.log4j + log4j-1.2-api + diff --git a/core/common/pom.xml b/core/common/pom.xml index 3a4e92a120c..0da8b73d48c 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -12,31 +12,19 @@ - org.apache.accumulo - accumulo-core - ${version.accumulo} - - - org.slf4j - * - - - commons-logging - commons-logging - - - junit - junit - - - log4j - log4j - - - javax.servlet - servlet-api - - + gov.nsa.datawave.microservice + dictionary-api + ${version.datawave.dictionary-api} + + + gov.nsa.datawave.microservice + query-api + ${version.datawave.query-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} org.springframework @@ -46,14 +34,23 @@ + + gov.nsa.datawave.microservice + dictionary-api + + + gov.nsa.datawave.microservice + query-api + gov.nsa.datawave.webservices datawave-ws-client ${project.version} - org.apache.accumulo - accumulo-core + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} org.springframework diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index 5cd352e0cac..131d9ccf3e3 100644 --- a/core/connection-pool/pom.xml +++ b/core/connection-pool/pom.xml @@ -8,47 +8,69 @@ datawave-core-connection-pool ${project.artifactId} - - 2.1.8 - - - - - dnsjava - dnsjava - ${version.dnsjava} - - - + com.fasterxml.jackson.module jackson-module-jaxb-annotations - commons-configuration - commons-configuration + com.google.guava + guava commons-lang commons-lang - - dnsjava - dnsjava - gov.nsa.datawave datawave-in-memory-accumulo gov.nsa.datawave.microservice - accumulo-api + accumulo-utils + + + gov.nsa.datawave.microservice + base-rest-responses + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} junit junit + + org.apache.accumulo + accumulo-core + + + org.slf4j + slf4j-reload4j + + + + + org.apache.commons + commons-pool2 + 2.4.2 + + + org.apache.curator + curator-client + + + org.apache.curator + curator-framework + org.apache.curator curator-recipes @@ -57,6 +79,25 @@ org.apache.curator curator-test + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.zookeeper + zookeeper + + + ch.qos.logback + logback* + + + + + org.apache.zookeeper + zookeeper-jute + ${version.zookeeper} + org.easymock easymock diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index fae52b0e7aa..4001ec999c5 100644 --- a/core/map-reduce/pom.xml +++ b/core/map-reduce/pom.xml @@ -9,6 +9,10 @@ datawave-core-map-reduce ${project.artifactId} + + commons-codec + commons-codec + gov.nsa.datawave.core datawave-core-common-util @@ -23,15 +27,56 @@ gov.nsa.datawave.microservice mapreduce-query-api + + gov.nsa.datawave.microservice + query-api + compile + gov.nsa.datawave.webservices datawave-ws-client ${project.version} + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-api + + + org.apache.logging.log4j + log4j-1.2-api + + + org.springframework + spring-context + + + org.springframework + spring-core + org.jboss.resteasy resteasy-jaxrs provided + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + provided + diff --git a/core/modification/pom.xml b/core/modification/pom.xml index d1857e45d07..a312efe4b7b 100644 --- a/core/modification/pom.xml +++ b/core/modification/pom.xml @@ -11,29 +11,101 @@ - gov.nsa.datawave - datawave-query-core - ${project.version} + com.google.code.findbugs + annotations - gov.nsa.datawave.core - datawave-core-common + com.google.guava + guava + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core ${project.version} - gov.nsa.datawave.core - datawave-core-common-util + gov.nsa.datawave + datawave-query-core ${project.version} + + + gov.nsa.datawave.core + datawave-core-connection-pool + + gov.nsa.datawave.core datawave-core-connection-pool ${project.version} + + 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 + metadata-utils + + + gov.nsa.datawave.microservice + query-api + + + gov.nsa.datawave.microservice + type-utils + + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client + + + org.apache.hadoop + hadoop-common + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + + + org.apache.hadoop + hadoop-client-api + + + org.apache.logging.log4j + log4j-1.2-api + junit junit diff --git a/core/query/pom.xml b/core/query/pom.xml index 6d8bf3b7058..d5872dfc84d 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -11,13 +11,42 @@ - gov.nsa.datawave.core - datawave-core-cached-results + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.google.code.findbugs + jsr305 + ${version.googlecode-findbugs} + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core ${project.version} gov.nsa.datawave.core - datawave-core-common + datawave-core-cached-results ${project.version} @@ -30,14 +59,38 @@ datawave-core-connection-pool ${project.version} + + gov.nsa.datawave.microservice + accumulo-api + + + gov.nsa.datawave.microservice + accumulo-utils + gov.nsa.datawave.microservice audit-api + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice base-rest-responses + + gov.nsa.datawave.microservice + common-utils + + + gov.nsa.datawave.microservice + dictionary-api + + + gov.nsa.datawave.microservice + query-api + gov.nsa.datawave.microservice query-metric-api @@ -57,6 +110,65 @@ + + io.protostuff + protostuff-api + + + io.protostuff + protostuff-core + + + io.protostuff + protostuff-runtime + ${version.protostuff} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} + + + org.apache.accumulo + accumulo-core + + + org.slf4j + slf4j-reload4j + + + + + org.apache.commons + commons-collections4 + + + org.apache.commons + commons-lang3 + ${version.commons-lang3} + + + org.apache.hadoop + hadoop-client-api + + + org.slf4j + slf4j-reload4j + + + + + org.apache.logging.log4j + log4j-1.2-api + + + org.springframework + spring-beans + + + org.springframework + spring-core + junit junit diff --git a/docs/pom.xml b/docs/pom.xml index 9e159c3fe2d..4d616601f13 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -242,12 +242,6 @@ 2.28.2 provided - - org.mockito - mockito-core - 2.28.2 - provided - org.picketbox picketbox diff --git a/pom.xml b/pom.xml index 94c0e9497eb..ea5a6fcd1db 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ 3.20.2 1.11.3 3.1.0 + 2.0.SP1 1.9.4 1.4 1.12 @@ -54,9 +55,13 @@ 2.6 3.3 2.6 + 3.9 1.2 + 3.0 + 3.6 1.6 1.11.0 + 2.3 5.2.0 5.2.0 4.0.0 @@ -73,16 +78,20 @@ 4.0.7 3.1.2 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 1.0.1 2.0.3 + 2.9.0 1.1.1 - 3.3.5 + 3.3.6 1.1.1 1.3 4.5.13 @@ -92,15 +101,28 @@ 2.13.4 1.9.13 2.3.3 + 1.3.4 + 2.0.2 3.24.0-GA 3.1.0 2.0.1.Final - 2.3.1 + 1 + 2.3.1 + 1.5.4 + 2.5 + 2.1.1 2.3.3 + 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 @@ -110,6 +132,7 @@ 2.20 2.17.2 7.5.0 + 3.4.1 2.5.2 1.6.0 1.2 @@ -117,6 +140,7 @@ 8.0.28 4.1.42.Final 2.1 + 2.3 5.0.3.Final 2.0.9 3.16.3 @@ -128,15 +152,21 @@ 2.9.6 3.5.2 0.17.0 + 2.0.21.Final + 1.2.6.Final 3.1.1.Final 3.1.1.Final + 2.3.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 - 3.8.3 + 1.4.01 + 3.8.2 @@ -519,6 +549,16 @@ mysql mysql-connector-java ${version.mysql-connector} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.accumulo @@ -746,9 +786,21 @@ ${version.hadoop} - * + com.sun.jersey + * + + + log4j * + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + @@ -1499,7 +1551,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.4.0 ch.qos.reload4j @@ -1517,12 +1569,6 @@ - - - org.apache.maven.shared - maven-dependency-analyzer - 1.11.1 - @@ -1533,7 +1579,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + ${version.maven-enforcer-plugin} enforce-maven @@ -1558,9 +1604,12 @@ log4j:log4j + ch.qos.reload4j:reload4j org.slf4j:slf4j-log4j12 ch.qos.logback:logback-classic + joda-time:joda-time + true true @@ -1846,7 +1895,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + ${version.maven-enforcer-plugin} de.skuzzle.enforcer @@ -2331,7 +2380,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 eeccfec916d..5ff965eedba 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/age-off/pom.xml b/warehouse/age-off/pom.xml index 1e0fe883efe..8840fa692e7 100644 --- a/warehouse/age-off/pom.xml +++ b/warehouse/age-off/pom.xml @@ -63,6 +63,11 @@ ${version.hamcrest} test + + org.junit.jupiter + junit-jupiter-api + test + org.mockito mockito-core diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 1854c6910d9..61dcd0673d8 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -9,25 +9,24 @@ assemble-webservice ${project.artifactId} - - commons-configuration - commons-configuration - gov.nsa.datawave datawave-ingest-core + + + org.apache.hadoop + hadoop-mapreduce-client-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 +36,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 44312fb1943..16ecc8459b2 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,30 +17,10 @@ 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 + ${version.opencsv} org.easymock diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index cc642399a63..ecf9568d60b 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,21 +93,47 @@ 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 + + javax.inject + javax.inject + junit junit @@ -90,7 +141,7 @@ net.sf.opencsv opencsv - 2.3 + ${version.opencsv} org.apache.accumulo @@ -98,11 +149,7 @@ org.apache.commons - commons-collections4 - - - org.apache.commons - commons-jexl3 + commons-lang3 org.apache.curator @@ -110,27 +157,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 +180,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 @@ -158,14 +193,6 @@ org.springframework spring-context - - org.springframework - spring-context-support - - - xerces - xercesImpl - org.apache.accumulo accumulo-server-base @@ -198,6 +225,12 @@ easymock test + + org.hamcrest + hamcrest-core + ${version.hamcrest} + test + diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index a221de28164..99b4afc369a 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 41b977533f9..7cc5d3e08d6 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -12,11 +12,32 @@ 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} + + + org.slf4j + slf4j-reload4j + + diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index c9ea5b9d58c..467889a1933 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -18,6 +18,18 @@ com.clearspring.analytics stream + + com.google.code.findbugs + jsr305 + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java + com.sun.xml.bind jaxb-impl @@ -28,24 +40,111 @@ 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.core datawave-core-common-util ${project.version} + + 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 @@ -54,49 +153,79 @@ jline jline - 2.12 + ${version.jline} + + + 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-client + + 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 - - - org.eclipse.jetty - * - - - org.eclipse.jetty.websocket - * - - + hadoop-client-runtime + ${version.hadoop} + + + org.apache.hadoop + hadoop-distcp org.apache.hadoop - hadoop-mapreduce-client-core + hadoop-mapreduce-client-common org.apache.logging.log4j @@ -113,6 +242,12 @@ org.apache.logging.log4j log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-core + + org.apache.lucene @@ -146,6 +281,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 @@ -155,19 +307,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 @@ -187,21 +332,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 @@ -214,17 +375,64 @@ 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.curator curator-test test + + 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 142d793bc4b..c37ffa3cac1 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -11,80 +11,122 @@ ${project.artifactId} - commons-net - commons-net - 3.6 + 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.hadoop + hadoop-mapreduce-client-core + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-common + + - gov.nsa.datawave.webservices - datawave-ws-common-util - ${project.version} - - - org.apache.hadoop - hadoop-distcp + gov.nsa.datawave.microservice + accumulo-utils + + + org.apache.accumulo + accumulo-core + + - org.apache.hadoop - hadoop-mapreduce-client-common + gov.nsa.datawave.microservice + type-utils - org.eclipse.jetty - * + log4j + log4j + + + org.slf4j + slf4j-log4j12 - org.eclipse.jetty.websocket - * + org.apache.hadoop + hadoop-common - org.apache.hadoop - hadoop-mapreduce-client-core + org.apache.accumulo + accumulo-core + + + org.slf4j + slf4j-reload4j + + - org.apache.lucene - lucene-analyzers-common + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + - 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 @@ -92,31 +134,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 @@ -129,10 +166,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 5a1e50d89a7..f9e68c7e103 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,51 +35,38 @@ 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.hadoop + hadoop-mapreduce-client-core + + - org.apache.hadoop - hadoop-distcp + org.apache.accumulo + accumulo-core - org.apache.hadoop - hadoop-mapreduce-client-common + org.apache.commons + commons-collections4 org.apache.hadoop - hadoop-mapreduce-client-core + hadoop-client-api + ${version.hadoop} - 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 +85,6 @@ accumulo-start provided - - org.apache.commons - commons-configuration2 - provided - com.sun.mail mailapi @@ -106,7 +100,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 c95b136e18e..31529cc6bff 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -10,18 +10,58 @@ jar ${project.artifactId} + + com.google.guava + guava + + + gov.nsa.datawave + datawave-core + + + gov.nsa.datawave + datawave-ingest-core + + + org.apache.hadoop + hadoop-mapreduce-client-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 +70,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 85c3f7707cb..9b44b375bd1 100644 --- a/warehouse/ingest-ssdeep/pom.xml +++ b/warehouse/ingest-ssdeep/pom.xml @@ -26,6 +26,12 @@ gov.nsa.datawave datawave-ingest-core ${project.version} + + + org.apache.hadoop + hadoop-mapreduce-client-core + + gov.nsa.datawave @@ -41,12 +47,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 07bc7e9f8ce..ae341720ee8 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -10,33 +10,101 @@ 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 + compile + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave datawave-ingest-core + + + org.apache.hadoop + hadoop-common + + + gov.nsa.datawave.microservice + type-utils + + + org.apache.hadoop + hadoop-mapreduce-client-core + + + + + 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 +118,6 @@ org.easymock easymock - - org.infinispan - infinispan-commons - org.powermock powermock-api-easymock @@ -62,6 +126,11 @@ org.powermock powermock-module-junit4 + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.woodstox woodstox-core @@ -83,15 +152,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 f7fd1f79d7b..7a44434a747 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 5c1a5866668..0882cceedc9 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 diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 7a7ab8416c4..0d520d208b5 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 diff --git a/warehouse/pom.xml b/warehouse/pom.xml index da60b2d81f8..83151a25711 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -245,9 +245,17 @@ ${version.hadoop} - * + log4j * + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + @@ -277,13 +285,25 @@ org.apache.hadoop - hadoop-mapreduce-client-common + hadoop-mapreduce-client-hs + ${version.hadoop} + + + org.apache.hadoop + hadoop-yarn-api ${version.hadoop} - com.sun.jersey + * * + + + + org.apache.hadoop + hadoop-yarn-client + ${version.hadoop} + log4j * @@ -298,30 +318,35 @@ - - org.apache.hadoop - hadoop-mapreduce-client-hs - ${version.hadoop} - - - org.apache.hadoop - hadoop-yarn-api - ${version.hadoop} - - - org.apache.hadoop - hadoop-yarn-client - ${version.hadoop} - 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 2e5bd5dd859..03e47f716d0 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,13 +51,33 @@ 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-io + commons-io + + + commons-lang + commons-lang commons-pool @@ -57,34 +90,36 @@ gov.nsa.datawave - datawave-core - ${project.version} + datawave-common gov.nsa.datawave - datawave-ingest-core + datawave-core ${project.version} gov.nsa.datawave - datawave-ssdeep-common - ${project.version} + datawave-in-memory-accumulo - gov.nsa.datawave.core - datawave-core-cached-results - ${project.version} + gov.nsa.datawave + datawave-ingest-core - log4j - log4j + org.apache.hadoop + hadoop-common - org.slf4j - slf4j-log4j12 + org.apache.hadoop + hadoop-mapreduce-client-core + + gov.nsa.datawave + datawave-ssdeep-common + ${project.version} + gov.nsa.datawave.core datawave-core-common @@ -95,25 +130,76 @@ datawave-core-common-util ${project.version} + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + gov.nsa.datawave.core datawave-core-query ${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-api + 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 @@ -123,15 +209,19 @@ metrics-core - javax.enterprise - cdi-api + io.protostuff + protostuff-api - - javax.ws.rs - jsr311-api - 1.1.1 - true + jakarta.validation + jakarta.validation-api + ${version.jakarta.validation-api} + compile + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} org.apache.accumulo @@ -143,30 +233,61 @@ + + 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.httpcomponents - httpclient + org.apache.hadoop + hadoop-client-api + ${version.hadoop} - org.apache.httpcomponents - httpcore + org.apache.logging.log4j + log4j-1.2-api org.apache.lucene - lucene-analyzers-common + lucene-core org.apache.lucene lucene-queryparser + + org.apache.zookeeper + zookeeper + org.assertj assertj-core @@ -178,24 +299,68 @@ org.geotools gt-geojson + + + com.googlecode.json-simple + json-simple + + - org.infinispan - infinispan-commons + org.geotools + gt-main org.javatuples javatuples - - org.jboss.resteasy - resteasy-jaxrs - true + 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.ow2.asm - asm + org.locationtech.jts + jts-core org.powermock @@ -205,6 +370,10 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + org.springframework spring-beans @@ -217,11 +386,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 @@ -242,15 +421,25 @@ commons-configuration2 provided + + com.fasterxml.jackson.datatype + jackson-datatype-guava + test + + + commons-collections + commons-collections + test + gov.nsa.datawave - datawave-edge-dictionary-core + datawave-common-test ${project.version} test gov.nsa.datawave - datawave-ingest-configuration + datawave-edge-dictionary-core ${project.version} test @@ -259,12 +448,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 @@ -277,6 +478,24 @@ datawave-ws-cached-results ${project.version} test + + + org.apache.hadoop + hadoop-common + + + + + gov.nsa.datawave.webservices + datawave-ws-common + ${project.version} + test + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -286,22 +505,58 @@ test-jar test + + gov.nsa.datawave.webservices + datawave-ws-common-util + ${project.version} + test + + + org.apache.hadoop + hadoop-common + + + gov.nsa.datawave.webservices datawave-ws-query ${project.version} test + + + org.apache.hadoop + hadoop-common + + + + + javax.inject + javax.inject + ${version.javax.inject} + test javax.validation validation-api test + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + test + junit junit test + + net.sf.opencsv + opencsv + ${version.opencsv} + test + org.apache.accumulo accumulo-minicluster @@ -322,6 +577,16 @@ + + org.apache.httpcomponents + httpclient + test + + + org.apache.httpcomponents + httpcore + test + org.bouncycastle bcpkix-jdk15on @@ -360,6 +625,18 @@ 1.4.4.Final test + + + org.jboss.resteasy + resteasy-jaxrs + test + true + + + org.jboss.shrinkwrap + shrinkwrap-api + test + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec @@ -410,6 +687,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/query-core/src/test/java/datawave/query/MaxExpansionIndexOnlyQueryTest.java b/warehouse/query-core/src/test/java/datawave/query/MaxExpansionIndexOnlyQueryTest.java index d10d0f2d8e8..cc0cae06677 100644 --- a/warehouse/query-core/src/test/java/datawave/query/MaxExpansionIndexOnlyQueryTest.java +++ b/warehouse/query-core/src/test/java/datawave/query/MaxExpansionIndexOnlyQueryTest.java @@ -14,8 +14,6 @@ import org.junit.ClassRule; import org.junit.Test; -import com.fasterxml.jackson.jaxrs.json.annotation.JSONP; - import datawave.query.exceptions.DatawaveFatalQueryException; import datawave.query.exceptions.FullTableScansDisallowedException; import datawave.query.planner.DefaultQueryPlanner; diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 9580dadb252..16f0aaa0a13 100644 --- a/warehouse/ssdeep-common/pom.xml +++ b/warehouse/ssdeep-common/pom.xml @@ -14,9 +14,29 @@ - gov.nsa.datawave - datawave-core - ${project.version} + 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 diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index 7669e315e63..d20c6fabd85 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 @@ -22,10 +30,6 @@ commons-lang commons-lang - - dnsjava - dnsjava - gov.nsa.datawave.core datawave-core-common-util @@ -42,6 +46,10 @@ gov.nsa.datawave.microservice accumulo-api + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice base-rest-responses @@ -72,14 +80,43 @@ 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 compile - 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 ddaaed6572e..906cd672a13 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -11,20 +11,66 @@ ${project.artifactId} - gov.nsa.datawave.webservices - datawave-ws-common + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + jboss + + + gov.nsa.datawave.core + datawave-core-connection-pool ${project.version} + jboss + + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.microservice + authorization-api + + + gov.nsa.datawave.microservice + base-rest-responses + + + 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 +78,44 @@ 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 + + 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 @@ -102,6 +162,11 @@ jboss-transaction-api_1.2_spec provided + + junit + junit + test + ${project.artifactId} @@ -125,7 +190,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 410007ddedc..d15d9e0dada 100644 --- a/web-services/cached-results/pom.xml +++ b/web-services/cached-results/pom.xml @@ -25,6 +25,12 @@ gov.nsa.datawave datawave-core + + + org.apache.hadoop + hadoop-client-api + + gov.nsa.datawave.core @@ -39,15 +45,106 @@ org.slf4j slf4j-log4j12 + + gov.nsa.datawave.microservice + query-api + + + + + gov.nsa.datawave.core + datawave-core-common + ${project.version} + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + jboss + + + gov.nsa.datawave.core + datawave-core-query + ${project.version} + + + gov.nsa.datawave.core + datawave-core-connection-pool + + + 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-api + 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 @@ -57,6 +154,18 @@ org.apache.commons commons-jexl3 + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.hadoop + hadoop-client-api + + + org.apache.logging.log4j + log4j-1.2-api + org.easymock easymock @@ -69,6 +178,10 @@ org.powermock powermock-module-junit4 + + org.springframework + spring-core + gov.nsa.datawave.webservices datawave-ws-client @@ -80,24 +193,56 @@ datawave-ws-common ${project.version} provided + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-client-api + + + gov.nsa.datawave.core + datawave-core-common + + 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 @@ -139,6 +284,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 738641fb237..5ae5913dda5 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -26,26 +26,17 @@ 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 gov.nsa.datawave.microservice - accumulo-api + accumulo-utils gov.nsa.datawave.microservice @@ -82,10 +73,6 @@ io.protostuff protostuff-api - - io.protostuff - protostuff-collectionschema - io.protostuff protostuff-core @@ -107,24 +94,28 @@ protostuff-yaml - java3d - vecmath - - - org.apache.accumulo - accumulo-core + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} - org.apache.commons - commons-collections4 + java3d + vecmath - org.apache.hadoop - hadoop-client-api + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} - org.apache.hadoop - hadoop-client-runtime + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-runtime + + org.easymock @@ -139,8 +130,8 @@ powermock-module-junit4 - xerces - xercesImpl + org.springframework + spring-core org.jboss.resteasy @@ -174,14 +165,13 @@ test - jakarta.xml.bind - jakarta.xml.bind-api - ${version.jakarta} + junit + junit test - junit - junit + org.apache.logging.log4j + log4j-1.2-api test @@ -189,6 +179,12 @@ junit-jupiter-api test + + org.powermock + powermock-api-support + ${version.powermock} + test + ${project.artifactId} @@ -248,8 +244,8 @@ lib runtime + compile provided - test diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 51cfe904575..475c575520f 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -10,32 +10,10 @@ 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.core - datawave-core-common - ${project.version} - gov.nsa.datawave.core datawave-core-common-util @@ -49,18 +27,16 @@ - gov.nsa.datawave.core - datawave-core-connection-pool - ${project.version} - jboss + 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 @@ -72,20 +48,24 @@ ${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} - 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 @@ -93,19 +73,34 @@ org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-client-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 @@ -139,6 +134,11 @@ org.powermock powermock-module-junit4 + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.jackson.core jackson-annotations @@ -176,13 +176,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 2f0eb0e5a65..c4842e4c510 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -10,15 +10,18 @@ ejb ${project.artifactId} - - aopalliance - aopalliance - 1.0 - com.clearspring.analytics stream + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + com.fasterxml.jackson.datatype jackson-datatype-guava @@ -36,8 +39,27 @@ dns - commons-configuration - commons-configuration + commons-lang + commons-lang + + + dnsjava + dnsjava + ${version.dnsjava} + + + gov.nsa.datawave + datawave-common-test + + + gov.nsa.datawave + datawave-core + + + javax.enterprise + cdi-api + + gov.nsa.datawave @@ -48,12 +70,35 @@ datawave-core-common ${project.version} + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + gov.nsa.datawave.core datawave-core-connection-pool ${project.version} jboss + + gov.nsa.datawave.microservice + accumulo-api + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + gov.nsa.datawave.microservice + accumulo-utils + gov.nsa.datawave.microservice audit-api @@ -62,13 +107,32 @@ gov.nsa.datawave.microservice authorization-api + + gov.nsa.datawave.microservice + base-rest-responses + gov.nsa.datawave.microservice metrics-reporter + + gov.nsa.datawave.microservice + query-api + gov.nsa.datawave.microservice query-metric-api + + + org.slf4j + slf4j-reload4j + + + + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} gov.nsa.datawave.webservices @@ -80,28 +144,59 @@ metrics-cdi - io.jsonwebtoken - jjwt-impl + 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} - io.jsonwebtoken - jjwt-jackson + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} + + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.servlet + javax.servlet-api + 3.1.0 + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} org.apache.accumulo accumulo-core + + + org.slf4j + slf4j-reload4j + + - org.apache.commons - commons-pool2 + commons-collections4 + ${version.commons-collections4} - org.apache.curator - curator-recipes + org.apache.commons + commons-lang3 + ${version.commons-lang3} org.apache.curator @@ -112,14 +207,6 @@ deltaspike-core-api compile - - org.apache.hadoop - hadoop-client-api - - - org.apache.hadoop - hadoop-client-runtime - org.apache.httpcomponents httpclient @@ -128,10 +215,6 @@ org.apache.httpcomponents httpcore - - org.apache.zookeeper - zookeeper - org.easymock easymock @@ -144,17 +227,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 @@ -266,6 +357,12 @@ javassist test + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-test diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index 4fe946f6f48..af1c9b1748f 100644 --- a/web-services/deploy/application/pom.xml +++ b/web-services/deploy/application/pom.xml @@ -205,6 +205,16 @@ ${project.version} war + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + javax.enterprise + cdi-api + ${version.cdi-api} + org.apache.commons commons-text diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index eb21dc01199..0ac965ba471 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,9 +25,39 @@ datawave-edge-dictionary-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.spec.javax.ejb + jboss-ejb-api_3.2_spec + ${version.jboss} + org.jboss.resteasy resteasy-jaxrs + provided + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + provided diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index 72ead4e5aa2..ab9f8840bff 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 diff --git a/web-services/examples/http-client/pom.xml b/web-services/examples/http-client/pom.xml index ca5023c63ae..f7448b896c3 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} + org.apache.accumulo accumulo-core diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 311108ca0ab..cc3b575d850 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 e1ce201a113..c495adc51be 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -11,8 +11,16 @@ ${project.artifactId} - commons-configuration - commons-configuration + com.google.guava + guava + + + commons-codec + commons-codec + + + commons-lang + commons-lang gov.nsa.datawave.core @@ -25,37 +33,69 @@ + + 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 mapreduce-query-api - javax.enterprise - cdi-api + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + javax.inject + javax.inject + ${version.javax.inject} + + + javax.servlet + servlet-api + ${version.javax.servlet-api} org.apache.accumulo accumulo-core - org.apache.commons - commons-compress + org.apache.accumulo + accumulo-hadoop-mapreduce - org.apache.hadoop - hadoop-client-api + org.apache.commons + commons-compress - org.apache.hadoop - hadoop-client-runtime + org.apache.deltaspike.core + deltaspike-core-api org.apache.hadoop - hadoop-mapreduce-client-core + hadoop-client-api + ${version.hadoop} - org.apache.hadoop - hadoop-yarn-api + org.apache.logging.log4j + log4j-1.2-api org.apache.oozie @@ -73,6 +113,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 @@ -94,13 +139,40 @@ slf4j-api - com.fasterxml.woodstox - woodstox-core + gov.nsa.datawave + datawave-core provided - gov.nsa.datawave - datawave-core + gov.nsa.datawave.core + datawave-core-common + ${project.version} + provided + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + jboss + provided + + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + jboss + provided + + + gov.nsa.datawave.core + datawave-core-query + ${project.version} + jboss + provided + + + gov.nsa.datawave.microservice + query-api provided @@ -195,6 +267,29 @@ hadoop-shaded-protobuf_3_7 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-context + test + org.springframework spring-expression diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 7310f743b7f..10899a1c0bc 100644 --- a/web-services/metrics/pom.xml +++ b/web-services/metrics/pom.xml @@ -10,27 +10,145 @@ ejb ${project.artifactId} + + com.google.guava + guava + + + commons-codec + commons-codec + + + commons-lang + commons-lang + + + gov.nsa.datawave + datawave-core + + + gov.nsa.datawave + datawave-ingest-core + ${project.version} + gov.nsa.datawave datawave-query-core ${project.version} + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + + + gov.nsa.datawave.core + datawave-core-query + ${project.version} + + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.microservice + base-rest-responses + + + gov.nsa.datawave.microservice + query-api + + + gov.nsa.datawave.microservice + query-metric-api + + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} + 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} + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + + + javax.enterprise + cdi-api + ${version.cdi-api} + + + javax.inject + javax.inject + ${version.javax.inject} + + + org.apache.accumulo + accumulo-core + + + org.apache.commons + commons-collections4 + + + org.apache.commons + commons-jexl3 + + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.hadoop + hadoop-client-api + + + org.apache.logging.log4j + log4j-1.2-api + gov.nsa.datawave datawave-ingest-configuration ${project.version} test + + junit + junit + test + ${project.artifactId} diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 51dc071ca3e..a4a38c849be 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 @@ -47,6 +91,20 @@ woodstox-core provided + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + jboss + provided + + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + jboss + provided + gov.nsa.datawave.webservices datawave-ws-client @@ -64,6 +122,12 @@ datawave-ws-common ${project.version} provided + + + org.apache.logging.log4j + log4j-slf4j-impl + + gov.nsa.datawave.webservices @@ -128,6 +192,12 @@ datawave-in-memory-accumulo test + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} + test + junit junit @@ -138,6 +208,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 ab5d29308d7..b9a2cbb1ef1 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -16,7 +16,11 @@ gov.nsa.datawave - datawave-query-core + datawave-core + + + gov.nsa.datawave.core + datawave-core-connection-pool ${project.version} @@ -25,8 +29,47 @@ ${project.version} - javax.enterprise - cdi-api + 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.deltaspike.core + deltaspike-core-api + + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.logging.log4j + log4j-1.2-api + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + jboss + provided gov.nsa.datawave.webservices diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index 0e7f2ec0bef..98736f49bf2 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 ab8e41e3a24..f66c149bdb5 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 @@ -24,8 +24,17 @@ protobuf-java - commons-configuration - commons-configuration + commons-cli + commons-cli + + + commons-lang + commons-lang + + + dnsjava + dnsjava + ${version.dnsjava} gov.nsa.datawave @@ -46,32 +55,84 @@ - gov.nsa.datawave - datawave-ingest-configuration - ${project.version} - true - - - gov.nsa.datawave - datawave-ingest-core + gov.nsa.datawave.core + datawave-core-common ${project.version} - org.apache.logging.log4j - log4j-slf4j-impl + gov.nsa.datawave.microservice + query-api + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + + + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} + gov.nsa.datawave.core datawave-core-query ${project.version} jboss + + + gov.nsa.datawave.core + datawave-core-connection-pool + + + + + 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 + query-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 @@ -83,31 +144,80 @@ + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + io.protostuff protostuff-api io.protostuff - protostuff-collectionschema + protostuff-core io.protostuff - protostuff-runtime + protostuff-yaml + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} - + 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 @@ -125,13 +235,30 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + + + org.springframework + spring-beans + org.springframework spring-context org.springframework - spring-expression + spring-core + + + org.springframework + spring-web + + + org.wildfly.security + wildfly-elytron + ${version.wildfly-elytron} com.fasterxml.jackson.core @@ -164,6 +291,12 @@ datawave-ws-common-util ${project.version} provided + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -176,6 +309,12 @@ cdi-api provided + + javax.servlet + javax.servlet-api + 3.1.0 + provided + org.apache.commons commons-configuration2 @@ -250,6 +389,12 @@ datawave-in-memory-accumulo test + + javax.servlet + servlet-api + ${version.javax.servlet-api} + test + junit junit @@ -260,6 +405,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 3d80982681c..a7dac01e531 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 8d6208bf507..5d0cd63f31b 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -10,63 +10,140 @@ ejb ${project.artifactId} + + com.fasterxml.jackson.core + jackson-databind + compile + com.fasterxml.jackson.datatype jackson-datatype-guava - com.spotify - dns + com.google.guava + guava + compile - commons-beanutils - commons-beanutils + gov.nsa.datawave + datawave-core + compile + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-client-api + + + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} - commons-cli - commons-cli + gov.nsa.datawave.core + datawave-core-connection-pool + ${project.version} - 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.microservice + query-api + + gov.nsa.datawave.webservices datawave-ws-common-util ${project.version} + + + org.apache.hadoop + hadoop-common + + + gov.nsa.datawave.core + datawave-core-connection-pool + + + + + 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 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 + commons-collections4 + compile - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes + org.apache.commons + commons-lang3 + ${version.commons-lang3} org.apache.curator @@ -76,22 +153,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 @@ -101,8 +199,14 @@ powermock-module-junit4 - org.powermock - powermock-reflect + org.slf4j + slf4j-api + compile + + + org.springframework + spring-context + compile com.fasterxml.jackson.module @@ -119,6 +223,34 @@ datawave-ws-common ${project.version} provided + + + org.apache.hadoop + hadoop-client-api + + + gov.nsa.datawave.core + datawave-core-connection-pool + + + + + 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 @@ -155,6 +287,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 @@ -180,6 +318,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 @@ -210,11 +360,37 @@ 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.microservice + query-api + test + gov.nsa.datawave.webservices datawave-ws-common @@ -233,6 +409,11 @@ javassist test + + org.jboss.arquillian.container + arquillian-container-test-api + test + org.jboss.arquillian.container arquillian-weld-ee-embedded-1.1 @@ -243,6 +424,16 @@ arquillian-junit-container test + + org.jboss.arquillian.junit + arquillian-junit-core + test + + + org.jboss.shrinkwrap + shrinkwrap-api + test + org.jboss.weld weld-core @@ -258,6 +449,23 @@ mockito-core test + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + + + org.springframework + spring-beans + test + org.springframework spring-expression @@ -268,6 +476,12 @@ spring-test test + + org.wildfly.common + wildfly-common + ${version.wildfly-common} + test + ${project.artifactId} From 8b5bdd1ffdb913b54b95dd2b969f6b24b5a94083 Mon Sep 17 00:00:00 2001 From: Christopher Gross Date: Fri, 17 Jan 2025 16:36:28 +0000 Subject: [PATCH 2/4] removed old commons-collections --- microservices/services/dictionary | 2 +- warehouse/query-core/pom.xml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/microservices/services/dictionary b/microservices/services/dictionary index 653cf5b5963..05c02c3e03a 160000 --- a/microservices/services/dictionary +++ b/microservices/services/dictionary @@ -1 +1 @@ -Subproject commit 653cf5b59634151b3eea881133fe604a0050df6e +Subproject commit 05c02c3e03aa09b25dfb24e8af88de9ec6aea54a diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 03e47f716d0..93bc02690ef 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -426,11 +426,6 @@ jackson-datatype-guava test - - commons-collections - commons-collections - test - gov.nsa.datawave datawave-common-test From 8d5eb2434bbc048171b5e6430188766b4e0acb1f Mon Sep 17 00:00:00 2001 From: Christopher Gross Date: Wed, 22 Jan 2025 13:15:02 +0000 Subject: [PATCH 3/4] increase timeout to 120s --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a44a40a1859..9ffa6a550a3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -375,7 +375,7 @@ services: test: curl -f http://localhost:8080/querymetric/mgmt/health interval: 10s timeout: 1s - start_period: 45s + start_period: 120s retries: 3 depends_on: authorization: From 41d951af6482ad290694ff161acefd1c744ea024 Mon Sep 17 00:00:00 2001 From: Christopher Gross Date: Wed, 22 Jan 2025 20:38:28 +0000 Subject: [PATCH 4/4] versioned off for high side testing --- common-test/pom.xml | 2 +- contrib/datawave-quickstart/docker/pom.xml | 2 +- core/base-rest-responses | 2 +- core/cached-results/pom.xml | 2 +- core/common-util/pom.xml | 2 +- core/common/pom.xml | 2 +- core/connection-pool/pom.xml | 2 +- core/in-memory-accumulo | 2 +- core/map-reduce/pom.xml | 2 +- core/metrics-reporter | 2 +- core/modification/pom.xml | 2 +- core/pom.xml | 2 +- core/query/pom.xml | 2 +- core/utils/accumulo-utils | 2 +- core/utils/metadata-utils | 2 +- core/utils/pom.xml | 2 +- core/utils/type-utils | 2 +- docs/pom.xml | 2 +- microservices/microservice-parent | 2 +- microservices/pom.xml | 2 +- microservices/services/accumulo | 2 +- microservices/services/audit | 2 +- microservices/services/authorization | 2 +- microservices/services/config | 2 +- microservices/services/dictionary | 2 +- microservices/services/file-provider | 2 +- microservices/services/hazelcast | 2 +- microservices/services/mapreduce-query | 2 +- microservices/services/modification | 2 +- microservices/services/pom.xml | 2 +- microservices/services/query | 2 +- microservices/services/query-executor | 2 +- microservices/services/query-metric | 2 +- microservices/starters/audit | 2 +- microservices/starters/cache | 2 +- microservices/starters/cached-results | 2 +- microservices/starters/datawave | 2 +- microservices/starters/metadata | 2 +- microservices/starters/pom.xml | 2 +- microservices/starters/query | 2 +- microservices/starters/query-metric | 2 +- pom.xml | 30 +++++++++---------- warehouse/accumulo-extensions/pom.xml | 2 +- warehouse/age-off-utils/pom.xml | 2 +- warehouse/age-off/pom.xml | 2 +- warehouse/assemble/datawave/pom.xml | 2 +- warehouse/assemble/pom.xml | 2 +- warehouse/assemble/webservice/pom.xml | 2 +- warehouse/common/pom.xml | 2 +- warehouse/core/pom.xml | 2 +- warehouse/data-dictionary-core/pom.xml | 2 +- warehouse/edge-dictionary-core/pom.xml | 2 +- .../edge-model-configuration-core/pom.xml | 2 +- warehouse/index-stats/pom.xml | 2 +- warehouse/ingest-configuration/pom.xml | 2 +- warehouse/ingest-core/pom.xml | 2 +- warehouse/ingest-csv/pom.xml | 2 +- warehouse/ingest-json/pom.xml | 2 +- warehouse/ingest-nyctlc/pom.xml | 2 +- warehouse/ingest-scripts/pom.xml | 2 +- warehouse/ingest-ssdeep/pom.xml | 2 +- warehouse/ingest-wikipedia/pom.xml | 2 +- warehouse/metrics-core/pom.xml | 2 +- warehouse/ops-tools/config-compare/pom.xml | 2 +- warehouse/ops-tools/index-validation/pom.xml | 2 +- warehouse/ops-tools/pom.xml | 2 +- warehouse/pom.xml | 2 +- warehouse/query-core/pom.xml | 2 +- warehouse/regression-testing/pom.xml | 2 +- warehouse/ssdeep-common/pom.xml | 2 +- web-services/accumulo/pom.xml | 2 +- web-services/atom/pom.xml | 2 +- web-services/cached-results/pom.xml | 2 +- web-services/client/pom.xml | 2 +- web-services/common-util/pom.xml | 2 +- web-services/common/pom.xml | 2 +- web-services/deploy/application/pom.xml | 2 +- web-services/deploy/configuration/pom.xml | 2 +- web-services/deploy/docs/pom.xml | 2 +- web-services/deploy/pom.xml | 2 +- .../spring-framework-integration/pom.xml | 2 +- web-services/dictionary/pom.xml | 2 +- web-services/examples/client-login/pom.xml | 2 +- web-services/examples/http-client/pom.xml | 2 +- web-services/examples/jms-client/pom.xml | 2 +- web-services/examples/pom.xml | 2 +- web-services/examples/query-war/pom.xml | 2 +- web-services/map-reduce-embedded/pom.xml | 2 +- web-services/map-reduce-status/pom.xml | 2 +- web-services/map-reduce/pom.xml | 3 +- web-services/metrics/pom.xml | 2 +- web-services/model/pom.xml | 2 +- web-services/modification/pom.xml | 2 +- web-services/pom.xml | 2 +- web-services/query-websocket/pom.xml | 2 +- web-services/query/pom.xml | 2 +- web-services/rest-api/pom.xml | 2 +- web-services/security/pom.xml | 2 +- web-services/web-root/pom.xml | 2 +- 99 files changed, 114 insertions(+), 113 deletions(-) diff --git a/common-test/pom.xml b/common-test/pom.xml index 560a56f3a1e..242d86421d9 100644 --- a/common-test/pom.xml +++ b/common-test/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-common-test ${project.artifactId} diff --git a/contrib/datawave-quickstart/docker/pom.xml b/contrib/datawave-quickstart/docker/pom.xml index d27009a8ed7..b31ec9df075 100644 --- a/contrib/datawave-quickstart/docker/pom.xml +++ b/contrib/datawave-quickstart/docker/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix ../../../pom.xml quickstart diff --git a/core/base-rest-responses b/core/base-rest-responses index c5b77e8a35f..bb14f8071f1 160000 --- a/core/base-rest-responses +++ b/core/base-rest-responses @@ -1 +1 @@ -Subproject commit c5b77e8a35f2c612378ea92a66a0a5881cfe1a73 +Subproject commit bb14f8071f1dda69d10855943e1da2ec1dad8357 diff --git a/core/cached-results/pom.xml b/core/cached-results/pom.xml index 2139ad2aef9..10308d66a19 100644 --- a/core/cached-results/pom.xml +++ b/core/cached-results/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-cached-results ${project.artifactId} diff --git a/core/common-util/pom.xml b/core/common-util/pom.xml index 4f6a1403e9b..b7c939cf916 100644 --- a/core/common-util/pom.xml +++ b/core/common-util/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-common-util ${project.artifactId} diff --git a/core/common/pom.xml b/core/common/pom.xml index 0da8b73d48c..91d698eff74 100644 --- a/core/common/pom.xml +++ b/core/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-common ${project.artifactId} diff --git a/core/connection-pool/pom.xml b/core/connection-pool/pom.xml index 131d9ccf3e3..834f9fc58b5 100644 --- a/core/connection-pool/pom.xml +++ b/core/connection-pool/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-connection-pool ${project.artifactId} diff --git a/core/in-memory-accumulo b/core/in-memory-accumulo index 8a9d2f46d20..0c611b7cc59 160000 --- a/core/in-memory-accumulo +++ b/core/in-memory-accumulo @@ -1 +1 @@ -Subproject commit 8a9d2f46d2012d4493baff5e8dc9f08f45f746d5 +Subproject commit 0c611b7cc59e5834df4f4cd29fcdb8fbbc1a6b8f diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index 4001ec999c5..e35bc69519e 100644 --- a/core/map-reduce/pom.xml +++ b/core/map-reduce/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-map-reduce ${project.artifactId} diff --git a/core/metrics-reporter b/core/metrics-reporter index 992378d6294..9352634fc19 160000 --- a/core/metrics-reporter +++ b/core/metrics-reporter @@ -1 +1 @@ -Subproject commit 992378d62946730d2ee799606276adca9522e050 +Subproject commit 9352634fc19eac1917e99c5943e2e8d136f6b8d5 diff --git a/core/modification/pom.xml b/core/modification/pom.xml index a312efe4b7b..148b940e349 100644 --- a/core/modification/pom.xml +++ b/core/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-modification ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index aa424368bb5..54d25b56646 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix gov.nsa.datawave.core datawave-core-parent diff --git a/core/query/pom.xml b/core/query/pom.xml index d5872dfc84d..f98df57145a 100644 --- a/core/query/pom.xml +++ b/core/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core-query ${project.artifactId} diff --git a/core/utils/accumulo-utils b/core/utils/accumulo-utils index 638b3eda970..b46e454f3c2 160000 --- a/core/utils/accumulo-utils +++ b/core/utils/accumulo-utils @@ -1 +1 @@ -Subproject commit 638b3eda97016bb66a7d014112b215075aac212e +Subproject commit b46e454f3c263d68879394db34c3fa74b25d28f3 diff --git a/core/utils/metadata-utils b/core/utils/metadata-utils index 9b84bb8b5ac..a60b0dab77d 160000 --- a/core/utils/metadata-utils +++ b/core/utils/metadata-utils @@ -1 +1 @@ -Subproject commit 9b84bb8b5ac291b2293619f7e1bd294579990a5d +Subproject commit a60b0dab77d0c95138f3259f473744746b0ed058 diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 79569c5d660..9ac4a6dc8ab 100644 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.core datawave-core-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix gov.nsa.datawave.core datawave-utils-parent diff --git a/core/utils/type-utils b/core/utils/type-utils index 867b89be186..988661d4c0b 160000 --- a/core/utils/type-utils +++ b/core/utils/type-utils @@ -1 +1 @@ -Subproject commit 867b89be1867e88b079ef8c11ca817655330222e +Subproject commit 988661d4c0bf1d3ce70b686d5955e217761a837f diff --git a/docs/pom.xml b/docs/pom.xml index 4d616601f13..215a3da1702 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-docs diff --git a/microservices/microservice-parent b/microservices/microservice-parent index 6207c9d6576..0d77d758ced 160000 --- a/microservices/microservice-parent +++ b/microservices/microservice-parent @@ -1 +1 @@ -Subproject commit 6207c9d65768c191773099a6f39f2b935aa52acd +Subproject commit 0d77d758cedba7ca97bc25c360bb163ad13755d1 diff --git a/microservices/pom.xml b/microservices/pom.xml index 48bad565717..216d0cfee82 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix gov.nsa.datawave.microservice datawave-microservice-build-parent diff --git a/microservices/services/accumulo b/microservices/services/accumulo index 6d3839d2895..376e0194104 160000 --- a/microservices/services/accumulo +++ b/microservices/services/accumulo @@ -1 +1 @@ -Subproject commit 6d3839d28955dc4ca56a9d1900038e0323a130c6 +Subproject commit 376e0194104edabb8a684f7bab78bdceb0f4d7f8 diff --git a/microservices/services/audit b/microservices/services/audit index 2714c97b19f..f5f9261b051 160000 --- a/microservices/services/audit +++ b/microservices/services/audit @@ -1 +1 @@ -Subproject commit 2714c97b19fdc9635fc7f18e3d1489e6d92a017d +Subproject commit f5f9261b0510fb4e7da8e83145ef2697fce5c682 diff --git a/microservices/services/authorization b/microservices/services/authorization index 292be85b633..d48a1331436 160000 --- a/microservices/services/authorization +++ b/microservices/services/authorization @@ -1 +1 @@ -Subproject commit 292be85b633c6f0f99ae9b3b382a4373ffc720a7 +Subproject commit d48a13314361aa66bd5bd59067b23bc7843fd38b diff --git a/microservices/services/config b/microservices/services/config index fc187c0e4b9..0eedab03d7e 160000 --- a/microservices/services/config +++ b/microservices/services/config @@ -1 +1 @@ -Subproject commit fc187c0e4b90c3eaea16dad3ba9ba5330262bcf7 +Subproject commit 0eedab03d7e2e76e7953c1146b22f8fece15d8ba diff --git a/microservices/services/dictionary b/microservices/services/dictionary index 05c02c3e03a..360cacf84d9 160000 --- a/microservices/services/dictionary +++ b/microservices/services/dictionary @@ -1 +1 @@ -Subproject commit 05c02c3e03aa09b25dfb24e8af88de9ec6aea54a +Subproject commit 360cacf84d9805597b2ef06fbed9e5149815b5e2 diff --git a/microservices/services/file-provider b/microservices/services/file-provider index 27080f3b943..16458b0d019 160000 --- a/microservices/services/file-provider +++ b/microservices/services/file-provider @@ -1 +1 @@ -Subproject commit 27080f3b943722f84aaa8af93e4fda7b41b50bd9 +Subproject commit 16458b0d019ccc19d75d6f4a7f648b8b8b5464b4 diff --git a/microservices/services/hazelcast b/microservices/services/hazelcast index 8abc2ef7e91..b0c776508a4 160000 --- a/microservices/services/hazelcast +++ b/microservices/services/hazelcast @@ -1 +1 @@ -Subproject commit 8abc2ef7e91c90bee920b129f67d540c61217f0a +Subproject commit b0c776508a4397214613f16e55a2041bf251f218 diff --git a/microservices/services/mapreduce-query b/microservices/services/mapreduce-query index 22af8f93c88..9f3487312ff 160000 --- a/microservices/services/mapreduce-query +++ b/microservices/services/mapreduce-query @@ -1 +1 @@ -Subproject commit 22af8f93c887db097c09078a477323be7877b184 +Subproject commit 9f3487312ff469681fa0c4f905622e34a2d4d8b7 diff --git a/microservices/services/modification b/microservices/services/modification index 768007f3195..4036c4e1ddb 160000 --- a/microservices/services/modification +++ b/microservices/services/modification @@ -1 +1 @@ -Subproject commit 768007f3195f688149666ba8a2a10b3d56d30fbf +Subproject commit 4036c4e1ddb17347fceaaa54f06810e8b80d4ce5 diff --git a/microservices/services/pom.xml b/microservices/services/pom.xml index 1e4d5738857..4b9f7e14017 100644 --- a/microservices/services/pom.xml +++ b/microservices/services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-microservice-service-build-parent pom diff --git a/microservices/services/query b/microservices/services/query index 14c65febd3d..305515e3bb4 160000 --- a/microservices/services/query +++ b/microservices/services/query @@ -1 +1 @@ -Subproject commit 14c65febd3d10548b972f8d3d213f82f9fa86918 +Subproject commit 305515e3bb4f2cc34e5494ad3ad1722bf6f3f531 diff --git a/microservices/services/query-executor b/microservices/services/query-executor index 4517c4c29ea..046ad9659d4 160000 --- a/microservices/services/query-executor +++ b/microservices/services/query-executor @@ -1 +1 @@ -Subproject commit 4517c4c29ea3c79499a306d7986bb81a00f12517 +Subproject commit 046ad9659d4eb349bf60ef306bf5727b2c4bd8e7 diff --git a/microservices/services/query-metric b/microservices/services/query-metric index 08c303c49d2..237c68848b7 160000 --- a/microservices/services/query-metric +++ b/microservices/services/query-metric @@ -1 +1 @@ -Subproject commit 08c303c49d2c648b29242e0d7828294b6ff83bdd +Subproject commit 237c68848b78c2e6335500653fd2daefddfe119b diff --git a/microservices/starters/audit b/microservices/starters/audit index ef18c9e6521..b228c016125 160000 --- a/microservices/starters/audit +++ b/microservices/starters/audit @@ -1 +1 @@ -Subproject commit ef18c9e6521c36a8fa64cb40a266cf6e532b0e64 +Subproject commit b228c016125288d1970ad6f1186b21bb397c1fd9 diff --git a/microservices/starters/cache b/microservices/starters/cache index 30196007910..5abf4399280 160000 --- a/microservices/starters/cache +++ b/microservices/starters/cache @@ -1 +1 @@ -Subproject commit 3019600791021114e50b387cc312c97375b979ff +Subproject commit 5abf43992802de7f742b1f67f1a0692378078d1a diff --git a/microservices/starters/cached-results b/microservices/starters/cached-results index b22a3d6a17a..b1daa10caa2 160000 --- a/microservices/starters/cached-results +++ b/microservices/starters/cached-results @@ -1 +1 @@ -Subproject commit b22a3d6a17a7f4eddfd5dc8e205e937b294e1c3c +Subproject commit b1daa10caa227c97881b57b67b30ab4fac8ac2da diff --git a/microservices/starters/datawave b/microservices/starters/datawave index 081e0a028a8..cbab4371b2a 160000 --- a/microservices/starters/datawave +++ b/microservices/starters/datawave @@ -1 +1 @@ -Subproject commit 081e0a028a85ab562a1fa419a590310bed030a7b +Subproject commit cbab4371b2aca5a7345298b88464b3466e23aec5 diff --git a/microservices/starters/metadata b/microservices/starters/metadata index 28337e6c230..064b14fea0a 160000 --- a/microservices/starters/metadata +++ b/microservices/starters/metadata @@ -1 +1 @@ -Subproject commit 28337e6c2306b44a888a4f6ba7825f268ab6ff18 +Subproject commit 064b14fea0aededfe149fa8c68ba61bed32f77e1 diff --git a/microservices/starters/pom.xml b/microservices/starters/pom.xml index 03269ea0667..f5c277dde26 100644 --- a/microservices/starters/pom.xml +++ b/microservices/starters/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.microservice datawave-microservice-build-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-microservice-starter-build-parent pom diff --git a/microservices/starters/query b/microservices/starters/query index ae730eab061..de8617d7830 160000 --- a/microservices/starters/query +++ b/microservices/starters/query @@ -1 +1 @@ -Subproject commit ae730eab0610c414bdfefbcaa0e072ec2751fa72 +Subproject commit de8617d7830ed89ed47f4c6efd0e45dc715be477 diff --git a/microservices/starters/query-metric b/microservices/starters/query-metric index fad3ed7859f..e8aad0db16c 160000 --- a/microservices/starters/query-metric +++ b/microservices/starters/query-metric @@ -1 +1 @@ -Subproject commit fad3ed7859fdc612a555ed498bd897aca168cfd9 +Subproject commit e8aad0db16c4bbaa3be5ff29d15f31ff5bc8af8c diff --git a/pom.xml b/pom.xml index ea5a6fcd1db..03f40c68a63 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix pom DataWave DataWave is a Java-based ingest and query framework that leverages Apache Accumulo to provide fast, secure access to your data. @@ -64,19 +64,19 @@ 2.3 5.2.0 5.2.0 - 4.0.0 - 4.0.0 - 4.0.0 - 4.0.0 - 4.0.1 - 3.0.0 - 4.0.1 - 1.0.0 - 4.0.8 - 3.0.0 - 1.0.0 - 4.0.7 - 3.1.2 + 4.0.1-depfix + 4.0.2-depfix + 4.0.2-depfix + 4.0.2-depfix + 4.0.2-depfix + 3.0.1-depfix + 4.0.5-depfix + 1.0.1-depfix + 4.0.9-depfix + 3.0.1-depfix + 1.0.1-depfix + 4.0.13-depfix + 3.1.3-depfix 1.9.0 2.1.8 3.2.6 @@ -96,7 +96,7 @@ 1.3 4.5.13 4.4.8 - 4.0.1 + 4.0.2-depfix 9.4.21.Final 2.13.4 1.9.13 diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml index 5ff965eedba..6ec3b4ca611 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-accumulo-extensions ${project.artifactId} diff --git a/warehouse/age-off-utils/pom.xml b/warehouse/age-off-utils/pom.xml index 18bb50160cf..4906f414288 100644 --- a/warehouse/age-off-utils/pom.xml +++ b/warehouse/age-off-utils/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-age-off-utils ${project.artifactId} diff --git a/warehouse/age-off/pom.xml b/warehouse/age-off/pom.xml index 8840fa692e7..6894012c46e 100644 --- a/warehouse/age-off/pom.xml +++ b/warehouse/age-off/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-age-off ${project.artifactId} diff --git a/warehouse/assemble/datawave/pom.xml b/warehouse/assemble/datawave/pom.xml index 734877489a0..6ab7db234dd 100644 --- a/warehouse/assemble/datawave/pom.xml +++ b/warehouse/assemble/datawave/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix assemble-datawave jar diff --git a/warehouse/assemble/pom.xml b/warehouse/assemble/pom.xml index d786a6c20f5..d5be7394afb 100644 --- a/warehouse/assemble/pom.xml +++ b/warehouse/assemble/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix assemble-parent pom diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 61dcd0673d8..a28405b0e50 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave assemble-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix assemble-webservice ${project.artifactId} diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 16ecc8459b2..2e83e0c4045 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-common ${project.artifactId} diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index ecf9568d60b..03f872895ba 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-core jar diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index 3fc2803a408..81e36388f32 100644 --- a/warehouse/data-dictionary-core/pom.xml +++ b/warehouse/data-dictionary-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-data-dictionary-core jar diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index de97cfc0563..a7b91272ef2 100644 --- a/warehouse/edge-dictionary-core/pom.xml +++ b/warehouse/edge-dictionary-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-edge-dictionary-core jar diff --git a/warehouse/edge-model-configuration-core/pom.xml b/warehouse/edge-model-configuration-core/pom.xml index 7a114a35918..be0be9d29c2 100644 --- a/warehouse/edge-model-configuration-core/pom.xml +++ b/warehouse/edge-model-configuration-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-edge-model-configuration-core jar diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index 99b4afc369a..48bc9b0be47 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-index-stats jar diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index 7cc5d3e08d6..1cb4deaa314 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-configuration diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 467889a1933..0fb7fbc66c1 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-core jar diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index c37ffa3cac1..e35949321e8 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-csv jar diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index f9e68c7e103..baf5cd1926d 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-json jar diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index 31529cc6bff..cdf770c0383 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-nyctlc jar diff --git a/warehouse/ingest-scripts/pom.xml b/warehouse/ingest-scripts/pom.xml index da40c0614d0..89d1867f6ed 100644 --- a/warehouse/ingest-scripts/pom.xml +++ b/warehouse/ingest-scripts/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-scripts ${project.artifactId} diff --git a/warehouse/ingest-ssdeep/pom.xml b/warehouse/ingest-ssdeep/pom.xml index 9b44b375bd1..7300a438af7 100644 --- a/warehouse/ingest-ssdeep/pom.xml +++ b/warehouse/ingest-ssdeep/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-ssdeep diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index ae341720ee8..600d285657e 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ingest-wikipedia jar diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 7a44434a747..c507e454ede 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-metrics-core jar diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index 0882cceedc9..d680b3ae76e 100644 --- a/warehouse/ops-tools/config-compare/pom.xml +++ b/warehouse/ops-tools/config-compare/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-ops-tools-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ops-tools-config-compare diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 0d520d208b5..7ecfb486fb6 100644 --- a/warehouse/ops-tools/index-validation/pom.xml +++ b/warehouse/ops-tools/index-validation/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-ops-tools-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ops-tools-index-validation jar diff --git a/warehouse/ops-tools/pom.xml b/warehouse/ops-tools/pom.xml index 139ed74be35..dfcfe27b64c 100644 --- a/warehouse/ops-tools/pom.xml +++ b/warehouse/ops-tools/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ops-tools-parent pom diff --git a/warehouse/pom.xml b/warehouse/pom.xml index 83151a25711..bafd5fa76a8 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-warehouse-parent pom diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 93bc02690ef..c6342b0cae4 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-query-core jar diff --git a/warehouse/regression-testing/pom.xml b/warehouse/regression-testing/pom.xml index f6f35a2c5ce..9d40b1fe613 100644 --- a/warehouse/regression-testing/pom.xml +++ b/warehouse/regression-testing/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-regression-testing ${project.artifactId} diff --git a/warehouse/ssdeep-common/pom.xml b/warehouse/ssdeep-common/pom.xml index 16f0aaa0a13..3c753cf4be6 100644 --- a/warehouse/ssdeep-common/pom.xml +++ b/warehouse/ssdeep-common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-warehouse-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ssdeep-common diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index d20c6fabd85..5f1525d5982 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-accumulo ejb diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 906cd672a13..92733323722 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-atom ejb diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index d15d9e0dada..fb7a17d3f0c 100644 --- a/web-services/cached-results/pom.xml +++ b/web-services/cached-results/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-cached-results ejb diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 5ae5913dda5..cb3a628ce24 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-client jar diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 475c575520f..223191e647c 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-common-util jar diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index c4842e4c510..6876800bc78 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-common ejb diff --git a/web-services/deploy/application/pom.xml b/web-services/deploy/application/pom.xml index af1c9b1748f..ece0f813ca3 100644 --- a/web-services/deploy/application/pom.xml +++ b/web-services/deploy/application/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-deploy-application ear diff --git a/web-services/deploy/configuration/pom.xml b/web-services/deploy/configuration/pom.xml index 3b6d6fb3950..5ebae92287b 100644 --- a/web-services/deploy/configuration/pom.xml +++ b/web-services/deploy/configuration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-deploy-configuration jar diff --git a/web-services/deploy/docs/pom.xml b/web-services/deploy/docs/pom.xml index c95a2f27814..eed0c9d6153 100644 --- a/web-services/deploy/docs/pom.xml +++ b/web-services/deploy/docs/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-deploy-docs war diff --git a/web-services/deploy/pom.xml b/web-services/deploy/pom.xml index 858dbd27d38..ca8f7fd5fbe 100644 --- a/web-services/deploy/pom.xml +++ b/web-services/deploy/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix gov.nsa.datawave.webservices datawave-ws-deploy-parent diff --git a/web-services/deploy/spring-framework-integration/pom.xml b/web-services/deploy/spring-framework-integration/pom.xml index 838a270b7ef..55e9ad44749 100644 --- a/web-services/deploy/spring-framework-integration/pom.xml +++ b/web-services/deploy/spring-framework-integration/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-deploy-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix spring-framework-integration ${project.artifactId} diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 0ac965ba471..f195dd55886 100644 --- a/web-services/dictionary/pom.xml +++ b/web-services/dictionary/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-dictionary ejb diff --git a/web-services/examples/client-login/pom.xml b/web-services/examples/client-login/pom.xml index ab9f8840bff..bf26eb80ace 100644 --- a/web-services/examples/client-login/pom.xml +++ b/web-services/examples/client-login/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-examples-client-login ejb diff --git a/web-services/examples/http-client/pom.xml b/web-services/examples/http-client/pom.xml index f7448b896c3..2428ebdd531 100644 --- a/web-services/examples/http-client/pom.xml +++ b/web-services/examples/http-client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-examples-http-client jar diff --git a/web-services/examples/jms-client/pom.xml b/web-services/examples/jms-client/pom.xml index dd3ca900b00..a49962ecfe7 100644 --- a/web-services/examples/jms-client/pom.xml +++ b/web-services/examples/jms-client/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-examples-jms-client jar diff --git a/web-services/examples/pom.xml b/web-services/examples/pom.xml index 871772f3dcb..eb32f277f5d 100644 --- a/web-services/examples/pom.xml +++ b/web-services/examples/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-examples-parent pom diff --git a/web-services/examples/query-war/pom.xml b/web-services/examples/query-war/pom.xml index 7bb3f5ba60d..20ae4b62b4c 100644 --- a/web-services/examples/query-war/pom.xml +++ b/web-services/examples/query-war/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-examples-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-examples-query-war war diff --git a/web-services/map-reduce-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml index 488f5dd8df1..749391acc0d 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-map-reduce-embedded jar diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index cc3b575d850..1bcce55e4cc 100644 --- a/web-services/map-reduce-status/pom.xml +++ b/web-services/map-reduce-status/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-map-reduce-status ejb diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index c495adc51be..e358777319e 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-map-reduce ejb @@ -56,6 +56,7 @@ gov.nsa.datawave.microservice mapreduce-query-api + 1.0.1-depfix jakarta.annotation diff --git a/web-services/metrics/pom.xml b/web-services/metrics/pom.xml index 10899a1c0bc..c9d7536ca4d 100644 --- a/web-services/metrics/pom.xml +++ b/web-services/metrics/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-metrics ejb diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index a4a38c849be..7500fdaca57 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-model ejb diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index b9a2cbb1ef1..419276273ce 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-modification ejb diff --git a/web-services/pom.xml b/web-services/pom.xml index 6a45047963e..9743706e63d 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave datawave-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix gov.nsa.datawave.webservices datawave-ws-parent diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index 98736f49bf2..94e3a726f88 100644 --- a/web-services/query-websocket/pom.xml +++ b/web-services/query-websocket/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-query-websocket war diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index f66c149bdb5..d57db64efec 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-query ejb diff --git a/web-services/rest-api/pom.xml b/web-services/rest-api/pom.xml index a7dac01e531..cfd7be0f2b0 100644 --- a/web-services/rest-api/pom.xml +++ b/web-services/rest-api/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-rest-api war diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 5d0cd63f31b..e30b76c6cb0 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-security ejb diff --git a/web-services/web-root/pom.xml b/web-services/web-root/pom.xml index f075f5fa5d7..1bc91d58c00 100644 --- a/web-services/web-root/pom.xml +++ b/web-services/web-root/pom.xml @@ -4,7 +4,7 @@ gov.nsa.datawave.webservices datawave-ws-parent - 7.15.0-SNAPSHOT + 7.15.0-depfix datawave-ws-web-root war