diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e60d6c94522..4af1fdd028d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,6 +77,9 @@ jobs: $RUN_TESTS \ || { echo "***** TESTS FAILED. Attempting retry."; $RUN_TESTS; } \ || { echo "***** TESTS FAILED. Attempting final retry."; $RUN_TESTS; } + - name: Analyze Dependencies + run: | + mvn -V -B -e -ntp "-Dstyle.color=always" dependency:analyze package -DskipTests=true # This step can be uncommented to support feature development. When developing a # feature which spans multiple repos, you can update the poms to use the latest diff --git a/common-test/pom.xml b/common-test/pom.xml index 790b6746082..d879ffcaeb6 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 f7f8d9f729f..59fdc15b88b 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-util/pom.xml b/core/common-util/pom.xml index 1314bf529f4..bfc2eddc91d 100644 --- a/core/common-util/pom.xml +++ b/core/common-util/pom.xml @@ -14,17 +14,22 @@ - gov.nsa.datawave.core - datawave-core-connection-pool - ${project.version} + gov.nsa.datawave.microservice + authorization-api - gov.nsa.datawave.microservice - accumulo-utils + jakarta.xml.bind + jakarta.xml.bind-api + ${version.jakarta} - gov.nsa.datawave.microservice - authorization-api + org.apache.commons + commons-lang3 + ${version.commons-lang3} + + + org.apache.logging.log4j + log4j-1.2-api org.apache.accumulo diff --git a/core/common/pom.xml b/core/common/pom.xml index 9839f80f8d8..073404c3e78 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 d451af16cca..1b896cbd8df 100644 --- a/core/connection-pool/pom.xml +++ b/core/connection-pool/pom.xml @@ -8,47 +8,65 @@ 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 +75,19 @@ org.apache.curator curator-test + + org.apache.logging.log4j + log4j-1.2-api + + + org.apache.zookeeper + zookeeper + + + org.apache.zookeeper + zookeeper-jute + ${version.zookeeper} + org.easymock easymock diff --git a/core/map-reduce/pom.xml b/core/map-reduce/pom.xml index fcdadfa5b0e..9d2f702b85a 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 d42c12869d9..9887738b1f3 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 83130c6a45f..71adf057eec 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 75a33ea38b8..7ff485fe7fe 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 56b8c966e42..5fc406e24b0 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,14 +78,18 @@ 4.0.7 3.0.3 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 1.1.1 @@ -92,15 +101,28 @@ 2.10.0.pr1 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,14 +152,19 @@ 2.9.6 3.2.5 0.17.0 + 2.0.21.Final + 1.2.6.Final 3.1.1.Final 3.1.1.Final 2.3.5.Final 17.0.1.Final + 1.5.1.Final + 1.9.1.Final 5.4.0 3.1.4 2.12.2 + 1.4.01 3.8.3 @@ -519,6 +548,16 @@ mysql mysql-connector-java ${version.mysql-connector} + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.accumulo @@ -1499,7 +1538,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.1.1 + 3.4.0 ch.qos.reload4j @@ -1517,12 +1556,6 @@ - - - org.apache.maven.shared - maven-dependency-analyzer - 1.11.1 - @@ -1533,7 +1566,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0 + ${version.maven-enforcer-plugin} enforce-maven @@ -1558,9 +1591,12 @@ log4j:log4j + ch.qos.reload4j:reload4j org.slf4j:slf4j-log4j12 ch.qos.logback:logback-classic + joda-time:joda-time + true true @@ -1846,7 +1882,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.3.0 + ${version.maven-enforcer-plugin} de.skuzzle.enforcer @@ -2331,7 +2367,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 157772709c6..48bdcb127e2 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 5448ff3eeea..7f17bdc87d7 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 48ee19e1c68..9f8e6f22034 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 8b60f0d493b..8b97a5c94b7 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 24acf36eb36..8b8d34e8a8d 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/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index 622b9fad288..a76020c1e6f 100644 --- a/warehouse/data-dictionary-core/pom.xml +++ b/warehouse/data-dictionary-core/pom.xml @@ -10,6 +10,28 @@ jar ${project.artifactId} + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + dnsjava + dnsjava + ${version.dnsjava} + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice dictionary-api @@ -18,10 +40,45 @@ gov.nsa.datawave.webservices datawave-ws-common + + gov.nsa.datawave.webservices + datawave-ws-common-util + + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 1d8873e3824..c5ba103340e 100644 --- a/warehouse/edge-dictionary-core/pom.xml +++ b/warehouse/edge-dictionary-core/pom.xml @@ -10,18 +10,90 @@ jar ${project.artifactId} + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + dnsjava + dnsjava + ${version.dnsjava} + + + gov.nsa.datawave.core + datawave-core-common + ${project.version} + + + gov.nsa.datawave.core + datawave-core-common-util + ${project.version} + + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice dictionary-api + + gov.nsa.datawave.microservice + query-api + + + gov.nsa.datawave.microservice + query-api + jboss + compile + gov.nsa.datawave.webservices datawave-ws-common + + gov.nsa.datawave.webservices + datawave-ws-common-util + + + io.dropwizard.metrics + metrics-annotation + ${version.dropwizard-metrics} + + + io.dropwizard.metrics + metrics-core + + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index 7e98a2a43f1..aca807399bc 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 501b17c77bc..9ff71914c05 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 3e2879b41ce..698f44a8117 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -10,64 +10,201 @@ jar ${project.artifactId} + + com.beust + jcommander + com.clearspring.analytics stream - com.sun.xml.bind - jaxb-impl - ${version.jaxb-impl} + com.google.code.findbugs + jsr305 + + + com.google.guava + guava + + + com.google.protobuf + protobuf-java com.timgroup java-statsd-client - commons-collections - commons-collections + commons-cli + commons-cli + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-lang + commons-lang gov.nsa.datawave datawave-accumulo-extensions ${project.version} + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-client-runtime + + + + + gov.nsa.datawave + datawave-common-test + + + org.apache.logging.log4j + log4j-core + + gov.nsa.datawave datawave-core ${project.version} + + + org.slf4j + slf4j-log4j12 + + + log4j + log4j + + gov.nsa.datawave.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 ${version.jakarta} - jline - jline - 2.12 + org.apache.accumulo + accumulo-core + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.accumulo accumulo-hadoop-mapreduce + + + org.apache.hadoop + hadoop-client-runtime + + org.apache.accumulo accumulo-server-base + + + org.apache.hadoop + hadoop-client-runtime + + + + + org.apache.commons + commons-collections4 org.apache.commons commons-jexl3 + + org.apache.commons + commons-lang3 + + + org.apache.curator + curator-test + org.apache.hadoop hadoop-annotations + + org.apache.hadoop + hadoop-client-api + ${version.hadoop} + + + org.apache.hadoop + hadoop-client-runtime + ${version.hadoop} + org.apache.hadoop hadoop-distcp @@ -86,10 +223,6 @@ - - org.apache.hadoop - hadoop-mapreduce-client-core - org.apache.logging.log4j log4j-1.2-api @@ -105,6 +238,12 @@ org.apache.logging.log4j log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-core + + org.apache.lucene @@ -138,6 +277,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 @@ -147,19 +303,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 @@ -179,21 +328,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 @@ -206,12 +371,59 @@ accumulo-minicluster ${version.accumulo} test + + + org.apache.accumulo + accumulo-server-base + + + org.apache.logging.log4j + log4j-core + + + org.apache.hadoop + hadoop-client-runtime + + + + + org.apache.zookeeper + zookeeper + test + + + org.hamcrest + hamcrest-core + ${version.hamcrest} + test org.javassist javassist test + + org.mockito + mockito-core + test + + + org.powermock + powermock-core + ${version.powermock} + test + + + org.powermock + powermock-reflect + ${version.powermock} + test + + + org.springframework + spring-jcl + test + diff --git a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java index a0e57a1aeba..472afc6f794 100644 --- a/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java +++ b/warehouse/ingest-core/src/main/java/datawave/ingest/data/tokenize/TokenSearchSynonymFilter.java @@ -15,8 +15,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionLengthAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; -import it.unimi.dsi.fastutil.Hash; - /** Wraps DefaultTokenSearch and exposes it as a Lucene TokenFilter. Not thread-safe */ public class TokenSearchSynonymFilter extends TokenFilter { diff --git a/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java b/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java index e86c0f45535..10ffafdd6be 100644 --- a/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java +++ b/warehouse/ingest-core/src/test/java/datawave/util/flag/IngestWorker.java @@ -9,8 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import jline.internal.Log; - /** * (U) Worker thread for moving ingest files from the native file system into the ingest directory for the specific ingest data type. */ @@ -32,7 +30,7 @@ public Void call() throws InterruptedException { try { fs.copyFromLocalFile(false, false, srcFiles, dst); } catch (IOException ioe) { - Log.error("thread(" + Thread.currentThread().getId() + ") unable to copy ingest files: " + ioe.getMessage()); + logger.error("thread(" + Thread.currentThread().getId() + ") unable to copy ingest files: " + ioe.getMessage()); } final int waitDur = cfg.getRandomInterval(); Thread.sleep(waitDur); diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 9df7e5d63b6..e7f21be6262 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 721429994df..68bcc858f7c 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 c647eb322a8..09bd20e6524 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 40443bf7f40..1774f096b5f 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 63bd31b38aa..6be46b75048 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 1e67c228f65..47ec3a99851 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 af9185a7b1d..6fee257f7f5 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 8039271e3e1..a9e10180ea7 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 2cdbeb122f5..066df818140 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -245,9 +245,17 @@ ${version.hadoop} - * + log4j * + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + @@ -307,21 +315,61 @@ org.apache.hadoop hadoop-yarn-api ${version.hadoop} + + + * + * + + org.apache.hadoop hadoop-yarn-client ${version.hadoop} + + + log4j + * + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + org.apache.hadoop hadoop-yarn-common ${version.hadoop} + + + * + * + + org.apache.hadoop hadoop-yarn-server-common ${version.hadoop} + + + log4j + * + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + org.apache.xmlbeans diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 9b484e98b60..a0606a05f92 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,64 @@ org.geotools gt-geojson - - - org.infinispan - infinispan-commons + + + com.googlecode.json-simple + json-simple + + org.javatuples javatuples - - org.jboss.resteasy - resteasy-jaxrs - true + org.locationtech.geowave + geowave-core-geotime + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + - org.ow2.asm - asm + org.locationtech.geowave + geowave-core-index + ${version.geowave} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + org.locationtech.geowave + geowave-core-store + ${version.geowave} + + + log4j + log4j + + + org.slf4j + slf4j-log4j12 + + + + + org.locationtech.jts + jts-core org.powermock @@ -205,6 +366,10 @@ org.powermock powermock-module-junit4 + + org.slf4j + slf4j-api + org.springframework spring-beans @@ -217,11 +382,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 +417,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 +444,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 +474,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 +501,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 +573,16 @@ + + org.apache.httpcomponents + httpclient + test + + + org.apache.httpcomponents + httpcore + test + org.bouncycastle bcpkix-jdk15on @@ -335,8 +596,8 @@ test - org.javassist - javassist + org.jboss.arquillian.container + arquillian-container-test-api test @@ -349,6 +610,11 @@ arquillian-junit-container test + + org.jboss.arquillian.junit + arquillian-junit-core + test + org.jboss.logging jboss-logging @@ -360,6 +626,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 @@ -405,6 +683,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 d26a9c37724..eb752c818e5 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 03802f0ec9a..400a373965c 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -11,8 +11,12 @@ ${project.artifactId} - com.fasterxml.jackson.module - jackson-module-jaxb-annotations + com.fasterxml.jackson.core + jackson-databind + + + com.google.guava + guava commons-configuration @@ -22,10 +26,6 @@ commons-lang commons-lang - - dnsjava - dnsjava - gov.nsa.datawave.core datawave-core-common-util @@ -42,6 +42,10 @@ gov.nsa.datawave.microservice accumulo-api + + gov.nsa.datawave.microservice + authorization-api + gov.nsa.datawave.microservice base-rest-responses @@ -69,8 +73,24 @@ - 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 @@ -78,8 +98,17 @@ 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 2507c685dc0..fd2338a5adb 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 a5f641cf457..0f67caf10ae 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 f41f319a63a..be7a3e9e8a1 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 d4cd0da1cdf..b770debe566 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,32 +73,39 @@ 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 easymock - - org.jboss.resteasy - resteasy-jaxb-provider - - - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec - org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec @@ -127,10 +114,6 @@ org.jboss.spec.javax.interceptor jboss-interceptors-api_1.2_spec - - org.jboss.spec.javax.servlet - jboss-servlet-api_4.0_spec - org.powermock powermock-api-easymock @@ -139,6 +122,11 @@ org.powermock powermock-module-junit4 + + xml-apis + xml-apis + ${version.xml-apis} + com.fasterxml.jackson.core jackson-annotations @@ -176,13 +164,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 8dbcf946246..19e15ed453e 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 8ab7e98f66a..5981217303d 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/deploy/spring-framework-integration/pom.xml b/web-services/deploy/spring-framework-integration/pom.xml index 9af6ee24e0a..94bf044e3e3 100644 --- a/web-services/deploy/spring-framework-integration/pom.xml +++ b/web-services/deploy/spring-framework-integration/pom.xml @@ -12,10 +12,37 @@ true + + gov.nsa.datawave + datawave-ingest-core + ${project.version} + + + io.astefanutti.metrics.cdi + metrics-cdi + + + jakarta.enterprise + jakarta.enterprise.cdi-api + 4.0.1 + + + org.apache.hadoop + hadoop-client-api + + + org.apache.hadoop + hadoop-client-runtime + org.easymock easymock + + org.glassfish + javax.el-impl + 3.0.1-b08-jbossorg-3 + com.fasterxml.jackson.module jackson-module-jaxb-annotations @@ -119,6 +146,12 @@ arquillian-junit-container test + + org.jboss.arquillian.test + arquillian-test-impl-base + 1.8.0.Final + test + org.jboss.resteasy resteasy-jaxrs @@ -160,6 +193,18 @@ weld-core-impl test + + org.jboss.weld + weld-spi + 3.1.SP1 + test + + + org.jboss.weld.module + weld-web + 3.0.0.CR2 + test + org.picketbox picketbox diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index c1ed7962d59..b1389b7fc45 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 4f1e485c578..a23fed92e42 100644 --- a/web-services/examples/client-login/pom.xml +++ b/web-services/examples/client-login/pom.xml @@ -30,10 +30,25 @@ protostuff-api compile + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api + + javax.inject + javax.inject + ${version.javax.inject} + + + org.jboss.spec.javax.annotation + jboss-annotations-api_1.3_spec + ${version.jboss} + org.picketbox picketbox @@ -80,4 +95,4 @@ - + \ No newline at end of file diff --git a/web-services/examples/http-client/pom.xml b/web-services/examples/http-client/pom.xml index d564122e6ed..540b3a26883 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-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml index 76341e64cd3..7524f5e89ff 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -11,22 +11,59 @@ ${project.artifactId} - gov.nsa.datawave.webservices - datawave-ws-common + commons-codec + commons-codec + + + commons-lang + commons-lang + + + 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 + authorization-api gov.nsa.datawave.webservices - datawave-ws-security + datawave-ws-common-util ${project.version} + + jakarta.annotation + jakarta.annotation-api + ${version.jakarta.annotation-api} + javax.enterprise cdi-api - org.jboss.spec.javax.annotation - jboss-annotations-api_1.3_spec + javax.inject + javax.inject + ${version.javax.inject} + + + org.apache.accumulo + accumulo-core + + + org.apache.deltaspike.core + deltaspike-core-api + + + org.apache.logging.log4j + log4j-1.2-api org.picketbox diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 305adbea0a0..05c29c0f8d3 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 61c7dd9e569..bc82abf2f73 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 a3cf54ab50c..270f7950296 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 20578156126..fccc30d92a7 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 ac6f499950e..fec5bf76817 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/pom.xml b/web-services/pom.xml index 1acd2fa7ed6..bd83e9e9d11 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -624,8 +624,12 @@ log4j:log4j + ch.qos.reload4j:reload4j org.slf4j:slf4j-log4j12 + org.slf4j:slf4j-reload4j + joda-time:joda-time + true @@ -709,6 +713,10 @@ enforce-no-snapshots none + + enforce-banned-dependencies + validate + diff --git a/web-services/query-websocket/pom.xml b/web-services/query-websocket/pom.xml index b564e60d122..3359152aaeb 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 bf4c9eca70c..48eba43583d 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 @@ -121,13 +231,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 @@ -160,6 +287,12 @@ datawave-ws-common-util ${project.version} provided + + + org.apache.hadoop + hadoop-common + + gov.nsa.datawave.webservices @@ -172,6 +305,12 @@ cdi-api provided + + javax.servlet + javax.servlet-api + 3.1.0 + provided + org.apache.commons commons-configuration2 @@ -246,6 +385,12 @@ datawave-in-memory-accumulo test + + javax.servlet + servlet-api + ${version.javax.servlet-api} + test + junit junit @@ -256,6 +401,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 c60baedfca9..e36e69b0df5 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 8ae0a67c4cb..1d70e7301c6 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}