From 367009b7ddaee9d23939a6100401e4bda358bcf8 Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Fri, 13 Oct 2023 17:16:02 +0000 Subject: [PATCH] dependency analysis in gitlab --- warehouse/accumulo-extensions/pom.xml | 8 - warehouse/assemble/webservice/pom.xml | 16 -- warehouse/core/pom.xml | 5 + warehouse/index-stats/pom.xml | 8 - warehouse/ingest-configuration/pom.xml | 4 - warehouse/ingest-core/pom.xml | 119 ++++++---- warehouse/ingest-csv/pom.xml | 106 ++++----- warehouse/ingest-json/pom.xml | 25 -- warehouse/ingest-nyctlc/pom.xml | 8 - warehouse/ingest-wikipedia/pom.xml | 41 +--- warehouse/metrics-core/pom.xml | 22 +- warehouse/ops-tools/index-validation/pom.xml | 26 +- warehouse/query-core/pom.xml | 170 +++++++------ web-services/atom/pom.xml | 41 ++-- web-services/cached-results/pom.xml | 53 +++-- web-services/client/pom.xml | 16 +- web-services/common-util/pom.xml | 12 +- web-services/dictionary/pom.xml | 40 +--- web-services/map-reduce-embedded/pom.xml | 14 -- web-services/map-reduce-status/pom.xml | 31 +-- web-services/map-reduce/pom.xml | 56 +---- web-services/model/pom.xml | 40 ++-- web-services/modification/pom.xml | 23 -- web-services/query-websocket/pom.xml | 102 -------- web-services/query/pom.xml | 115 +++------ web-services/security/pom.xml | 237 +++++++++++++++++-- 26 files changed, 586 insertions(+), 752 deletions(-) diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml index cd9ff95a6a4..2491f830185 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -18,14 +18,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-client-runtime - - - org.apache.hadoop - hadoop-common - org.apache.logging.log4j log4j-1.2-api diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 22d78682728..9ccebbcb0ac 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -9,18 +9,10 @@ assemble-webservice ${project.artifactId} - - commons-configuration - commons-configuration - gov.nsa.datawave datawave-ingest-core - - gov.nsa.datawave - datawave-query-core - org.apache.accumulo accumulo-core @@ -30,14 +22,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-client-runtime - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.powermock powermock-api-easymock diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 77f0ac81a6d..71c3a7fe1d8 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -137,6 +137,11 @@ org.slf4j slf4j-api + + org.slf4j + slf4j-api + + org.springframework spring-context diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index d0f30c6e42d..c81060b78ee 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -67,14 +67,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api diff --git a/warehouse/ingest-configuration/pom.xml b/warehouse/ingest-configuration/pom.xml index e52e658c73c..06810b9fc96 100644 --- a/warehouse/ingest-configuration/pom.xml +++ b/warehouse/ingest-configuration/pom.xml @@ -33,10 +33,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index dc95f6bfa89..274f744c659 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -26,11 +26,6 @@ com.google.protobuf protobuf-java - - com.sun.xml.bind - jaxb-impl - 2.3.3 - com.timgroup java-statsd-client @@ -43,10 +38,6 @@ commons-codec commons-codec - - commons-collections - commons-collections - commons-io commons-io @@ -68,11 +59,21 @@ 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 @@ -113,34 +114,61 @@ 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 ${version.jakarta.xml.bind-api} - - jline - jline - ${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 @@ -154,18 +182,6 @@ org.apache.commons commons-lang3 - - org.apache.curator - curator-client - - - org.apache.curator - curator-framework - - - org.apache.curator - curator-recipes - org.apache.curator curator-test @@ -174,10 +190,6 @@ org.apache.hadoop hadoop-annotations - - org.apache.hadoop - hadoop-client - org.apache.hadoop hadoop-client-api @@ -188,22 +200,10 @@ hadoop-client-runtime ${version.hadoop} - - org.apache.hadoop - hadoop-common - org.apache.hadoop hadoop-distcp - - org.apache.hadoop - hadoop-mapreduce-client-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api @@ -219,6 +219,12 @@ org.apache.logging.log4j log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-core + + org.apache.lucene @@ -236,11 +242,6 @@ org.infinispan infinispan-commons - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${version.jboss} - org.powermock powermock-api-easymock @@ -265,10 +266,6 @@ org.springframework spring-core - - org.springframework - spring-jcl - xerces xercesImpl @@ -287,6 +284,12 @@ org.apache.accumulo accumulo-start provided + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.commons @@ -344,6 +347,20 @@ accumulo-minicluster ${version.accumulo} test + + + org.apache.accumulo + accumulo-server-base + + + org.apache.logging.log4j + log4j-core + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.zookeeper diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index ad6e8550579..081ef30b28c 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -14,10 +14,6 @@ com.google.guava guava - - com.google.protobuf - protobuf-java - commons-lang commons-lang @@ -26,32 +22,50 @@ 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-common + + + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.microservice accumulo-utils - - - gov.nsa.datawave.microservice - metadata-utils - log4j - log4j - - - org.slf4j - slf4j-log4j12 + org.apache.accumulo + accumulo-core @@ -67,23 +81,12 @@ org.slf4j slf4j-log4j12 + + org.apache.hadoop + hadoop-common + - - gov.nsa.datawave.webservices - datawave-ws-common-util - ${project.version} - - - io.dropwizard.metrics - metrics-annotation - ${version.dropwizard-metrics} - - - io.dropwizard.metrics - metrics-core - ${version.dropwizard-metrics} - org.apache.accumulo accumulo-core @@ -93,47 +96,14 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-distcp - - - org.apache.hadoop - hadoop-mapreduce-client-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api - - org.apache.lucene - lucene-analyzers-common - - - org.apache.lucene - lucene-core - org.easymock easymock - - org.infinispan - infinispan-commons - - - org.jboss.resteasy - jaxrs-api - 3.0.12.Final - org.powermock powermock-module-junit4 @@ -157,6 +127,12 @@ datawave-common-test ${project.version} test + + + org.apache.accumulo + accumulo-core + + javax.mail @@ -174,6 +150,12 @@ accumulo-minicluster ${version.accumulo} test + + + org.apache.accumulo + accumulo-core + + xerces diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 8b51da6aa62..4f407546409 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -53,14 +53,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-distcp - org.apache.hadoop hadoop-mapreduce-client-common @@ -73,27 +65,10 @@ org.apache.logging.log4j log4j-1.2-api - - org.apache.lucene - lucene-analyzers-common - - - org.apache.lucene - lucene-core - org.easymock easymock - - org.infinispan - infinispan-commons - - - org.jboss.resteasy - jaxrs-api - 3.0.12.Final - org.powermock powermock-api-easymock diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index d1378450976..9f5ab8e00cb 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -41,14 +41,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 3cd2d692f58..3e5a35563eb 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -35,6 +35,12 @@ gov.nsa.datawave datawave-ingest-configuration + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave @@ -70,12 +76,12 @@ log4j log4j + + org.apache.hadoop + hadoop-common + - - gov.nsa.datawave.webservices - datawave-ws-common-util - org.apache.accumulo accumulo-core @@ -85,24 +91,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-distcp - - - org.apache.hadoop - hadoop-mapreduce-client-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.logging.log4j log4j-1.2-api @@ -119,10 +107,6 @@ org.easymock easymock - - org.infinispan - infinispan-commons - org.powermock powermock-api-easymock @@ -157,11 +141,6 @@ 1.4.5 test - - gov.nsa.datawave.webservices - datawave-ws-common - test - javax.mail javax.mail-api diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index ea360c53d06..4c3dc058ab6 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -22,10 +22,6 @@ commons-cli commons-cli - - commons-configuration - commons-configuration - commons-lang commons-lang @@ -51,15 +47,17 @@ gov.nsa.datawave datawave-query-core + + + org.apache.hadoop + hadoop-mapreduce-client-core + + gov.nsa.datawave.microservice common-utils - - javax.enterprise - cdi-api - org.apache.accumulo accumulo-core @@ -73,14 +71,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 85486d92272..bff6dcea0f7 100644 --- a/warehouse/ops-tools/index-validation/pom.xml +++ b/warehouse/ops-tools/index-validation/pom.xml @@ -18,10 +18,6 @@ commons-cli commons-cli - - commons-logging - commons-logging - org.apache.accumulo accumulo-core @@ -37,31 +33,11 @@ - - 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.hadoop - hadoop-common - org.apache.logging.log4j log4j-1.2-api @@ -71,7 +47,7 @@ zookeeper - gov.nsa.datawave.contrib + gov.nsa.datawave datawave-in-memory-accumulo test diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 5eebdb46687..ae2629cb853 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -30,10 +30,6 @@ com.fasterxml.jackson.core jackson-databind - - com.fasterxml.jackson.datatype - jackson-datatype-guava - com.github.ben-manes.caffeine caffeine @@ -71,15 +67,6 @@ commons-codec commons-codec - - commons-collections - commons-collections - ${version.commons-collections} - - - commons-configuration - commons-configuration - commons-io commons-io @@ -107,11 +94,17 @@ gov.nsa.datawave - datawave-ingest-core + datawave-in-memory-accumulo - gov.nsa.datawave.contrib - datawave-in-memory-accumulo + gov.nsa.datawave + datawave-ingest-core + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.microservice @@ -158,6 +151,12 @@ gov.nsa.datawave.microservice type-utils + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -190,6 +189,12 @@ datawave-ws-query ${project.version} ejb + + + org.apache.hadoop + hadoop-common + + io.dropwizard.metrics @@ -228,16 +233,6 @@ javax.ws.rs-api ${version.javax.ws.rs-api} - - javax.xml.bind - jaxb-api - ${version.javax.jaxb-api} - - - net.sf.opencsv - opencsv - ${version.opencsv} - org.apache.accumulo accumulo-core @@ -291,17 +286,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - ${version.hadoop} - - - com.sun.jersey - jersey-server - - - org.apache.hadoop hadoop-mapreduce-client-core @@ -315,8 +299,8 @@ httpcore - org.apache.lucene - lucene-analyzers-common + org.apache.logging.log4j + log4j-1.2-api org.apache.lucene @@ -341,6 +325,12 @@ org.geotools gt-geojson + + + com.googlecode.json-simple + json-simple + + org.infinispan @@ -350,43 +340,10 @@ org.javatuples javatuples - - org.jboss.arquillian.container - arquillian-container-test-api - - - org.jboss.resteasy - jaxrs-api - ${version.jboss.resteasy} - org.jboss.resteasy resteasy-jaxrs - - org.jboss.shrinkwrap - shrinkwrap-api - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - ${version.jboss} - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec - ${version.jboss} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${version.jboss} - org.locationtech.geowave geowave-core-geotime @@ -435,28 +392,14 @@ org.locationtech.jts jts-core - - org.ow2.asm - asm - org.powermock powermock-api-easymock - - org.powermock - powermock-core - ${version.powermock} - org.powermock powermock-module-junit4 - - org.powermock - powermock-reflect - ${version.powermock} - org.slf4j slf4j-api @@ -473,10 +416,6 @@ org.springframework spring-core - - org.springframework - spring-jcl - xml-apis xml-apis @@ -507,6 +446,11 @@ commons-configuration2 provided + + com.fasterxml.jackson.datatype + jackson-datatype-guava + test + gov.nsa.datawave datawave-common-test @@ -518,18 +462,36 @@ 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.webservices datawave-ws-cached-results ${project.version} test + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -549,6 +511,12 @@ junit test + + net.sf.opencsv + opencsv + ${version.opencsv} + test + org.apache.accumulo accumulo-minicluster @@ -581,6 +549,11 @@ 1.67 test + + org.jboss.arquillian.container + arquillian-container-test-api + test + org.jboss.arquillian.container arquillian-weld-ee-embedded-1.1 @@ -607,6 +580,11 @@ 1.4.4.Final test + + org.jboss.shrinkwrap + shrinkwrap-api + test + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec @@ -652,6 +630,18 @@ picketbox test + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-test diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index 56a8ca9e16f..d761bc8ca97 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -17,16 +17,34 @@ gov.nsa.datawave.microservice base-rest-responses + + + org.apache.hadoop + hadoop-client-runtime + + gov.nsa.datawave.webservices datawave-ws-common ${project.version} + + + org.apache.hadoop + hadoop-client-runtime + + gov.nsa.datawave.webservices datawave-ws-common-util ${project.version} + + + org.apache.hadoop + hadoop-common + + jakarta.annotation @@ -43,11 +61,11 @@ javax.ws.rs-api ${version.javax.ws.rs-api} + org.apache.abdera abdera-core - org.apache.abdera abdera-i18n @@ -59,15 +77,17 @@ org.apache.accumulo accumulo-core + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.deltaspike.core deltaspike-core-api - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - org.apache.hadoop hadoop-client-api @@ -77,10 +97,6 @@ org.apache.hadoop hadoop-client-runtime - - org.apache.hadoop - hadoop-common - org.apache.logging.log4j log4j-1.2-api @@ -88,15 +104,12 @@ org.apache.ws.commons.axiom axiom-api + compile org.apache.ws.commons.axiom axiom-impl - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} + compile com.fasterxml.woodstox diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index c1e19747d9c..652235dac31 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.microservice @@ -70,10 +76,6 @@ jakarta.annotation-api ${version.jakarta.annotation-api} - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -87,6 +89,12 @@ org.apache.accumulo accumulo-core + + + org.apache.hadoop + hadoop-client-api + + org.apache.commons @@ -100,11 +108,6 @@ org.apache.deltaspike.core deltaspike-core-api - - org.apache.hadoop - hadoop-client-api - ${version.hadoop} - org.apache.hadoop hadoop-common @@ -117,20 +120,10 @@ org.easymock easymock - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - org.powermock powermock-api-easymock - - org.powermock - powermock-core - ${version.powermock} - org.powermock powermock-module-junit4 @@ -155,6 +148,10 @@ org.apache.hadoop hadoop-common + + org.apache.hadoop + hadoop-client-api + @@ -174,12 +171,24 @@ 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 @@ -221,6 +230,12 @@ javassist test + + org.powermock + powermock-core + ${version.powermock} + test + org.powermock powermock-reflect diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 4db6ac6413c..6b5b5bd040c 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -30,10 +30,6 @@ commons-lang commons-lang - - gov.nsa.datawave - datawave-core - gov.nsa.datawave.microservice accumulo-api @@ -46,10 +42,6 @@ gov.nsa.datawave.microservice dictionary-api - - gov.nsa.datawave.microservice - metadata-utils - gov.nsa.datawave.microservice type-utils @@ -105,15 +97,23 @@ org.apache.accumulo accumulo-core + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.commons commons-collections4 + org.easymock easymock diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index ebf3d57c5b7..e1837c32ac6 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -10,27 +10,21 @@ jar ${project.artifactId} - - commons-collections - commons-collections - ${version.commons-collections} - compile - commons-lang commons-lang gov.nsa.datawave.microservice - accumulo-utils + authorization-api gov.nsa.datawave.microservice - authorization-api + base-rest-responses gov.nsa.datawave.microservice - base-rest-responses + common-utils gov.nsa.datawave.microservice diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 1416adc9120..59a41a6ae8a 100644 --- a/web-services/dictionary/pom.xml +++ b/web-services/dictionary/pom.xml @@ -15,20 +15,20 @@ dnsjava ${version.dnsjava} - - gov.nsa.datawave - datawave-data-dictionary-core - ${project.version} - - - gov.nsa.datawave - datawave-edge-dictionary-core - ${project.version} - gov.nsa.datawave datawave-query-core ${project.version} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + + + org.jboss.spec.javax.ws.rs + jboss-jaxrs-api_2.1_spec + + jakarta.annotation @@ -49,31 +49,11 @@ org.apache.httpcomponents httpclient - - org.jboss.resteasy - jaxrs-api - ${version.jboss.resteasy} - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - ${version.jboss} - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec - ${version.jboss} - org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec ${version.jboss} - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - ${project.artifactId} diff --git a/web-services/map-reduce-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml index 88000970215..e3438a5cfca 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -32,11 +32,6 @@ datawave-ws-common-util ${project.version} - - gov.nsa.datawave.webservices - datawave-ws-security - ${project.version} - jakarta.annotation jakarta.annotation-api @@ -63,15 +58,6 @@ org.apache.logging.log4j log4j-1.2-api - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - ${version.jboss} - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec - org.picketbox picketbox diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 95bd866af87..a1170097af4 100644 --- a/web-services/map-reduce-status/pom.xml +++ b/web-services/map-reduce-status/pom.xml @@ -14,20 +14,11 @@ gov.nsa.datawave.microservice base-rest-responses - - gov.nsa.datawave.webservices - datawave-ws-security - ${project.version} - jakarta.annotation jakarta.annotation-api ${version.jakarta.annotation-api} - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -42,16 +33,6 @@ org.apache.logging.log4j log4j-1.2-api - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - ${version.jboss} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - gov.nsa.datawave.webservices datawave-ws-client @@ -63,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 diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 4653b4fb75d..708c3c6da5e 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -18,10 +18,6 @@ commons-codec commons-codec - - commons-configuration - commons-configuration - commons-lang commons-lang @@ -52,10 +48,6 @@ jakarta.xml.bind-api ${version.jakarta.xml.bind-api} - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -87,22 +79,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-client-runtime - - - org.apache.hadoop - hadoop-mapreduce-client-core - - - org.apache.hadoop - hadoop-yarn-api - - - org.apache.hadoop.thirdparty - hadoop-shaded-protobuf_3_7 - org.apache.logging.log4j log4j-1.2-api @@ -123,21 +99,11 @@ org.easymock easymock - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - ${version.jboss} - org.jboss.spec.javax.ws.rs jboss-jaxrs-api_2.1_spec ${version.jboss} - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${version.jboss} - org.jboss.weld.se weld-se-core @@ -150,20 +116,10 @@ org.powermock powermock-api-easymock - - org.powermock - powermock-core - ${version.powermock} - org.powermock powermock-module-junit4 - - org.powermock - powermock-reflect - ${version.powermock} - org.slf4j slf4j-api @@ -269,6 +225,18 @@ ${version.powermock} test + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-expression diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 85dfe871b68..6d547e60b43 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -18,14 +18,6 @@ com.google.guava guava - - com.google.protobuf - protobuf-java - - - commons-configuration - commons-configuration - commons-lang commons-lang @@ -42,6 +34,10 @@ gov.nsa.datawave.microservice base-rest-responses + + gov.nsa.datawave.microservice + dictionary-api + gov.nsa.datawave.microservice metadata-utils @@ -51,10 +47,6 @@ jakarta.annotation-api ${version.jakarta.annotation-api} - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -73,10 +65,11 @@ hadoop-client-api ${version.hadoop} + org.apache.logging.log4j log4j-1.2-api @@ -90,11 +83,6 @@ jboss-jaxrs-api_2.1_spec ${version.jboss} - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${version.jboss} - org.powermock powermock-api-easymock @@ -103,6 +91,10 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + com.fasterxml.woodstox woodstox-core @@ -125,6 +117,12 @@ datawave-ws-common ${project.version} provided + + + org.apache.logging.log4j + log4j-slf4j-impl + + gov.nsa.datawave.webservices @@ -194,6 +192,12 @@ javassist test + + org.jboss.spec.javax.xml.bind + jboss-jaxb-api_2.3_spec + ${version.jboss} + test + org.powermock powermock-core diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index cc3455e6a5a..36883b2611b 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -40,10 +40,6 @@ jakarta.annotation-api ${version.jakarta.annotation-api} - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -67,29 +63,10 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - org.apache.logging.log4j log4j-1.2-api - - org.jboss.resteasy - jaxrs-api - ${version.jboss.resteasy} - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.2_spec - ${version.jboss} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - gov.nsa.datawave.webservices datawave-ws-client diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index 6a16a8f3e0c..c668b889648 100644 --- a/web-services/query-websocket/pom.xml +++ b/web-services/query-websocket/pom.xml @@ -26,36 +26,15 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - - com.google.guava - guava - - - commons-lang - commons-lang - - - gov.nsa.datawave - datawave-core - gov.nsa.datawave.microservice base-rest-responses - - gov.nsa.datawave.microservice - common-utils - gov.nsa.datawave.webservices datawave-ws-client ${project.version} - - gov.nsa.datawave.webservices - datawave-ws-common - ${project.version} - gov.nsa.datawave.webservices datawave-ws-common-util @@ -71,40 +50,6 @@ datawave-ws-security ${project.version} - - io.dropwizard.metrics - metrics-annotation - ${version.dropwizard-metrics} - - - io.dropwizard.metrics - metrics-core - ${version.dropwizard-metrics} - - - io.undertow - undertow-core - ${version.undertow-core} - - - io.undertow - undertow-servlet - ${version.undertow-servlet} - - - jakarta.annotation - jakarta.annotation-api - ${version.jakarta.annotation-api} - - - jakarta.xml.bind - jakarta.xml.bind-api - ${version.jakarta.xml.bind-api} - - - javax.enterprise - cdi-api - javax.inject javax.inject @@ -115,58 +60,11 @@ javax.ws.rs-api ${version.javax.ws.rs-api} - - org.apache.commons - commons-lang3 - ${version.commons-lang3} - - - org.apache.hadoop - hadoop-common - - - org.apache.httpcomponents - httpcore - - - org.infinispan - infinispan-commons - - - org.jboss.arquillian.container - arquillian-container-test-api - ${version.arquillian} - - - org.jboss.logging - jboss-logging - ${version.jboss.logging} - org.jboss.spec.javax.interceptor jboss-interceptors-api_1.2_spec ${version.jboss} - - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec - ${version.jboss-servlet-api-4.0} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - - - org.jboss.xnio - xnio-api - ${version.jboss.xnio} - - - org.powermock - powermock-reflect - ${version.powermock} - org.slf4j slf4j-api diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 577a2548385..24133f1f342 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -10,6 +10,10 @@ ejb ${project.artifactId} + + com.fasterxml.jackson.core + jackson-annotations + com.google.code.gson gson @@ -33,12 +37,9 @@ ${version.commons-collections} - commons-configuration - commons-configuration - - - commons-configuration - commons-configuration + commons-collections + commons-collections + ${version.commons-collections} commons-lang @@ -67,23 +68,6 @@ - - gov.nsa.datawave - datawave-ingest-configuration - ${project.version} - true - - - gov.nsa.datawave - datawave-ingest-core - ${project.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - - - gov.nsa.datawave.microservice accumulo-api @@ -128,6 +112,10 @@ org.slf4j slf4j-log4j12 + + org.apache.hadoop + hadoop-common + @@ -140,19 +128,10 @@ metrics-annotation ${version.dropwizard-metrics} - - io.dropwizard.metrics - metrics-core - ${version.dropwizard-metrics} - io.protostuff protostuff-api - - io.protostuff - protostuff-collectionschema - io.protostuff protostuff-core @@ -180,35 +159,15 @@ javax.inject ${version.javax.inject} - - javax.servlet - servlet-api - ${version.javax.servlet-api} - javax.ws.rs javax.ws.rs-api ${version.javax.ws.rs-api} - - javax.xml.bind - jaxb-api - ${version.javax.jaxb-api} - org.apache.accumulo accumulo-core - - org.apache.accumulo - accumulo-server-base - - - org.apache.zookeeper - zookeeper - - - org.apache.commons commons-collections4 @@ -217,12 +176,6 @@ org.apache.commons commons-jexl - - org.apache.commons - commons-math3 - ${version.commons-math3} - jar - org.apache.deltaspike.core deltaspike-core-api @@ -232,10 +185,6 @@ hadoop-client-api ${version.hadoop} - - org.apache.hadoop - hadoop-common - org.apache.httpcomponents httpclient @@ -257,21 +206,6 @@ jboss-annotations-api_1.3_spec ${version.jboss} - - org.jboss.spec.javax.servlet - jboss-servlet-api_3.1_spec - ${version.jboss} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${version.jboss} - - - org.jboss.spec.javax.xml.bind - jboss-jaxb-api_2.3_spec - ${version.jboss} - org.powermock powermock-api-easymock @@ -296,20 +230,11 @@ org.springframework spring-core - - org.springframework - spring-expression - org.wildfly.security wildfly-elytron ${version.wildfly-elytron} - - xml-apis - xml-apis - ${version.xml-apis} - com.fasterxml.jackson.core jackson-core @@ -341,6 +266,12 @@ datawave-ws-common-util ${project.version} provided + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -413,6 +344,12 @@ datawave-in-memory-accumulo test + + javax.servlet + servlet-api + ${version.javax.servlet-api} + test + junit junit @@ -441,6 +378,12 @@ ${version.powermock} test + + xml-apis + xml-apis + ${version.xml-apis} + test + ${project.artifactId} diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 2c6b9670e9f..3c286ffda6c 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -11,62 +11,127 @@ ${project.artifactId} - com.fasterxml.jackson.datatype - jackson-datatype-guava + com.fasterxml.jackson.core + jackson-databind + compile - com.spotify - dns + com.fasterxml.jackson.datatype + jackson-datatype-guava - commons-beanutils - commons-beanutils + com.google.guava + guava + compile - commons-cli - commons-cli + gov.nsa.datawave + datawave-core + compile + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-client-api + + - commons-collections - commons-collections + gov.nsa.datawave.microservice + authorization-api - commons-configuration - commons-configuration + gov.nsa.datawave.microservice + base-rest-responses + compile gov.nsa.datawave.microservice - authorization-api + common-utils + compile gov.nsa.datawave.webservices datawave-ws-client ${project.version} + + + org.apache.hadoop + hadoop-client-api + + gov.nsa.datawave.webservices datawave-ws-common-util ${project.version} + + + org.apache.hadoop + hadoop-common + + + + + io.dropwizard.metrics + metrics-core + ${version.dropwizard-metrics} + compile + + + io.undertow + undertow-core + ${version.undertow-core} + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + compile + + + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta.xml.bind-api} + compile javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + compile + + + javax.ws.rs + javax.ws.rs-api + ${version.javax.ws.rs-api} + org.apache.accumulo accumulo-core + + + org.apache.hadoop + hadoop-client-api + + org.apache.commons - commons-digester3 - - - org.apache.curator - curator-framework + commons-collections4 + compile - org.apache.curator - curator-recipes + org.apache.commons + commons-lang3 + ${version.commons-lang3} org.apache.curator @@ -76,22 +141,50 @@ org.apache.deltaspike.core deltaspike-core-api + + org.apache.hadoop + hadoop-client-api + + org.apache.httpcomponents httpclient - org.bouncycastle - bcprov-jdk16 + org.apache.httpcomponents + httpcore + compile org.easymock easymock + + org.infinispan + infinispan-commons + compile + org.infinispan infinispan-core + + org.jboss.logging + jboss-logging + ${version.jboss.logging} + compile + + + org.jboss.xnio + xnio-api + ${version.jboss.xnio} + org.powermock powermock-api-easymock @@ -100,6 +193,16 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + compile + + + org.springframework + spring-context + compile + com.fasterxml.jackson.module jackson-module-jaxb-annotations @@ -115,6 +218,24 @@ datawave-ws-common ${project.version} provided + + + org.apache.hadoop + hadoop-client-api + + + + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + provided + + + io.undertow + undertow-servlet + ${version.undertow-servlet} + provided org.apache.commons @@ -151,6 +272,12 @@ resteasy-jaxrs provided + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.2_spec + ${version.jboss} + provided + org.jboss.spec.javax.annotation jboss-annotations-api_1.3_spec @@ -176,6 +303,18 @@ jboss-jacc-api_1.5_spec provided + + org.jboss.spec.javax.servlet + jboss-servlet-api_3.1_spec + ${version.jboss} + provided + + + org.jboss.spec.javax.servlet + jboss-servlet-api_4.0_spec + ${version.jboss-servlet-api-4.0} + provided + org.jboss.spec.javax.transaction jboss-transaction-api_1.2_spec @@ -206,11 +345,32 @@ wildfly-undertow provided + + org.wildfly.security + wildfly-elytron + ${version.wildfly-elytron} + provided + + + commons-io + commons-io + test + gov.nsa.datawave datawave-in-memory-accumulo test + + gov.nsa.datawave.microservice + accumulo-api + test + + + gov.nsa.datawave.microservice + dictionary-api + test + gov.nsa.datawave.webservices datawave-ws-common @@ -229,6 +389,11 @@ javassist test + + org.jboss.arquillian.container + arquillian-container-test-api + test + org.jboss.arquillian.container arquillian-weld-ee-embedded-1.1 @@ -239,6 +404,16 @@ arquillian-junit-container test + + org.jboss.arquillian.junit + arquillian-junit-core + test + + + org.jboss.shrinkwrap + shrinkwrap-api + test + org.jboss.weld weld-core @@ -249,11 +424,29 @@ weld-core-impl test + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + org.springframework spring-expression test + + org.wildfly.common + wildfly-common + ${version.wildfly-common} + test + ${project.artifactId}