From 76cf780b0fda82e730af80b698456cb4048304b1 Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Fri, 1 Dec 2023 20:24:38 +0000 Subject: [PATCH] put back commons-configuration, jaxrs-api, opencsv, vecmath, resteasy-jaxb-provider --- warehouse/assemble/webservice/pom.xml | 4 ++++ warehouse/common/pom.xml | 5 +++++ warehouse/core/pom.xml | 5 +++++ warehouse/ingest-csv/pom.xml | 5 +++++ warehouse/ingest-json/pom.xml | 5 +++++ warehouse/metrics-core/pom.xml | 4 ++++ web-services/accumulo/pom.xml | 4 ++++ web-services/client/pom.xml | 4 ++++ web-services/common-util/pom.xml | 8 ++++++++ web-services/common/pom.xml | 4 ++++ web-services/map-reduce/pom.xml | 4 ++++ web-services/model/pom.xml | 4 ++++ web-services/query/pom.xml | 4 ++++ web-services/security/pom.xml | 4 ++++ 14 files changed, 64 insertions(+) diff --git a/warehouse/assemble/webservice/pom.xml b/warehouse/assemble/webservice/pom.xml index 80dabea81e9..8d4ad6b0880 100644 --- a/warehouse/assemble/webservice/pom.xml +++ b/warehouse/assemble/webservice/pom.xml @@ -9,6 +9,10 @@ assemble-webservice ${project.artifactId} + + commons-configuration + commons-configuration + gov.nsa.datawave datawave-ingest-core diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index 3306cc33e60..69dc5a080b5 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -17,6 +17,11 @@ commons-io commons-io + + net.sf.opencsv + opencsv + 2.3 + org.easymock easymock diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 92b5cd6cc47..398e85983b0 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -100,6 +100,11 @@ junit junit + + net.sf.opencsv + opencsv + 2.3 + org.apache.accumulo accumulo-core diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 1e1f262cc56..fccca815164 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -104,6 +104,11 @@ org.easymock easymock + + org.jboss.resteasy + jaxrs-api + 3.0.12.Final + org.powermock powermock-module-junit4 diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 5faae3d92bb..8ac08462d37 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -69,6 +69,11 @@ org.easymock easymock + + org.jboss.resteasy + jaxrs-api + 3.0.12.Final + org.powermock powermock-api-easymock diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 90a404f2407..6fb7f5f37cf 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -22,6 +22,10 @@ commons-cli commons-cli + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index df0c2676196..e6de302dfd1 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -18,6 +18,10 @@ com.google.guava guava + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index 710539d3aee..c613f6914a3 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -89,6 +89,10 @@ jakarta.xml.bind-api ${version.jakarta.xml.bind-api} + + java3d + vecmath + javax.ws.rs javax.ws.rs-api diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index 15f73dc17d1..4e6c27390f0 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -10,6 +10,10 @@ jar ${project.artifactId} + + commons-configuration + commons-configuration + commons-lang commons-lang @@ -76,6 +80,10 @@ org.easymock easymock + + org.jboss.resteasy + resteasy-jaxb-provider + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index 5518843318c..ae5ad1fa51d 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -30,6 +30,10 @@ com.spotify dns + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index a107ecad20b..1517259a3f3 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -18,6 +18,10 @@ commons-codec commons-codec + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 7c4fa961d17..38b641c59c8 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -18,6 +18,10 @@ com.google.guava guava + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index 3fc0b66ceec..e5a3e7b93b9 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -41,6 +41,10 @@ commons-collections ${version.commons-collections} + + commons-configuration + commons-configuration + commons-lang commons-lang diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 97e020efd7e..c504a46c79f 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -24,6 +24,10 @@ guava compile + + commons-configuration + commons-configuration + gov.nsa.datawave datawave-core