From d7eda87db76d8afafb59b88c2ca22e6e89cbada0 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 4 Nov 2019 18:07:20 +0000 Subject: Use jersey dependencies from policy-endpoints There is no need to have Jersey dependencies in the PDP POMs as they are inherited from the policy-endpoints POM. Issue-ID: POLICY-2209 Change-Id: I5c53e7b29f4df25fd730f7a521e149e4ee70d964 Signed-off-by: liamfallon --- client/client-deployment/pom.xml | 16 +++------ client/client-editor/pom.xml | 24 ++++---------- client/client-full/pom.xml | 9 ----- client/client-monitoring/pom.xml | 12 +++---- examples/examples-decisionmaker/pom.xml | 10 ------ examples/examples-onap-bbs/pom.xml | 10 ------ examples/examples-onap-vcpe/pom.xml | 5 --- examples/examples-servlet/pom.xml | 4 --- .../plugins-event-carrier-restclient/pom.xml | 4 --- .../plugins-event-carrier-restrequestor/pom.xml | 24 ++------------ .../plugins-event-carrier-restserver/pom.xml | 8 ----- services/services-onappf/pom.xml | 38 ---------------------- .../integration/integration-uservice-test/pom.xml | 14 -------- .../performance/performance-benchmark-test/pom.xml | 12 ------- 14 files changed, 18 insertions(+), 172 deletions(-) diff --git a/client/client-deployment/pom.xml b/client/client-deployment/pom.xml index cd139e181..5aa8f41a3 100644 --- a/client/client-deployment/pom.xml +++ b/client/client-deployment/pom.xml @@ -32,6 +32,10 @@ Web client for deploying models in Apex engine + + org.onap.policy.common + policy-endpoints + org.onap.policy.apex-pdp.core core-deployment @@ -41,18 +45,6 @@ org.glassfish.jersey.containers jersey-container-grizzly2-http - - org.glassfish.jersey.media - jersey-media-multipart - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.inject - jersey-hk2 - commons-cli commons-cli diff --git a/client/client-editor/pom.xml b/client/client-editor/pom.xml index 39162424b..2577148fd 100644 --- a/client/client-editor/pom.xml +++ b/client/client-editor/pom.xml @@ -32,6 +32,10 @@ Web client for editing Apex policies + + org.onap.policy.common + policy-endpoints + org.onap.policy.common utils @@ -55,12 +59,9 @@ jersey-media-moxy - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.inject - jersey-hk2 + org.glassfish.jersey.test-framework.providers + jersey-test-framework-provider-grizzly2 + test commons-cli @@ -71,17 +72,6 @@ junit test - - org.glassfish.jersey.test-framework - jersey-test-framework-core - test - - - org.glassfish.jersey.test-framework.providers - jersey-test-framework-provider-grizzly2 - test - - org.onap.policy.apex-pdp.client client-common diff --git a/client/client-full/pom.xml b/client/client-full/pom.xml index 6f8c11697..257d3d7e6 100644 --- a/client/client-full/pom.xml +++ b/client/client-full/pom.xml @@ -47,12 +47,6 @@ client-deployment ${project.version} - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - - - org.onap.policy.apex-pdp.client client-monitoring @@ -82,9 +76,6 @@ assertj-core test - - - diff --git a/client/client-monitoring/pom.xml b/client/client-monitoring/pom.xml index 5ae5412b3..4e5eb0b3e 100644 --- a/client/client-monitoring/pom.xml +++ b/client/client-monitoring/pom.xml @@ -32,6 +32,10 @@ Web client for monitoring Apex engines + + org.onap.policy.common + policy-endpoints + org.onap.policy.apex-pdp.core core-deployment @@ -41,14 +45,6 @@ org.glassfish.jersey.containers jersey-container-grizzly2-http - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.inject - jersey-hk2 - commons-cli commons-cli diff --git a/examples/examples-decisionmaker/pom.xml b/examples/examples-decisionmaker/pom.xml index cafc60d56..b063bf4dc 100644 --- a/examples/examples-decisionmaker/pom.xml +++ b/examples/examples-decisionmaker/pom.xml @@ -48,16 +48,6 @@ ${project.version} test - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema plugins-context-schema-avro diff --git a/examples/examples-onap-bbs/pom.xml b/examples/examples-onap-bbs/pom.xml index b36bc73c4..298395669 100644 --- a/examples/examples-onap-bbs/pom.xml +++ b/examples/examples-onap-bbs/pom.xml @@ -49,16 +49,6 @@ ${project.version} test - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - test - - - org.glassfish.jersey.inject - jersey-hk2 - test - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema plugins-context-schema-avro diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml index f58a5ebf5..16bae184e 100644 --- a/examples/examples-onap-vcpe/pom.xml +++ b/examples/examples-onap-vcpe/pom.xml @@ -49,11 +49,6 @@ ${project.version} test - - org.glassfish.jersey.inject - jersey-hk2 - test - org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema plugins-context-schema-avro diff --git a/examples/examples-servlet/pom.xml b/examples/examples-servlet/pom.xml index 3e89e92a6..f0e2deafd 100644 --- a/examples/examples-servlet/pom.xml +++ b/examples/examples-servlet/pom.xml @@ -36,10 +36,6 @@ javax.servlet javax.servlet-api - - org.glassfish.jersey.inject - jersey-hk2 - org.onap.policy.apex-pdp.services services-engine diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml index d016c7593..1e91322dc 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml @@ -32,10 +32,6 @@ [${project.parent.artifactId}] Plugin for handling events being transported over REST where Apex acts as a REST client - - org.glassfish.jersey.core - jersey-client - org.onap.policy.apex-pdp.services services-engine diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml index 8d9ac3edf..21a342bf1 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml @@ -32,39 +32,21 @@ - org.glassfish.jersey.core - jersey-client + org.onap.policy.common + policy-endpoints + test org.onap.policy.apex-pdp.services services-engine ${project.version} - - org.glassfish.jersey.containers - jersey-container-grizzly2-http - test - org.onap.policy.apex-pdp.plugins.plugins-executor plugins-executor-javascript ${project.version} test - - org.glassfish.jersey.inject - jersey-hk2 - test - - - org.onap.policy.common - policy-endpoints - test - - - org.glassfish.jersey.containers - jersey-container-servlet-core - diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml index f173aa454..5e5887e12 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml @@ -36,18 +36,10 @@ services-engine ${project.version} - - org.glassfish.jersey.core - jersey-client - org.glassfish.jersey.containers jersey-container-grizzly2-http - - org.glassfish.jersey.containers - jersey-container-servlet-core - org.onap.policy.common policy-endpoints diff --git a/services/services-onappf/pom.xml b/services/services-onappf/pom.xml index cf14e5f0d..c964b5a65 100644 --- a/services/services-onappf/pom.xml +++ b/services/services-onappf/pom.xml @@ -41,44 +41,6 @@ org.onap.policy.common policy-endpoints - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.core - jersey-common - - - org.glassfish.jersey.containers - jersey-container-jetty-http - - - org.glassfish.jersey.core - jersey-server - - - javax.ws.rs - javax.ws.rs-api - - - org.glassfish.hk2 - hk2-api - - - org.glassfish.hk2.external - javax.inject - - - org.glassfish.jersey.core - jersey-client - - - - - org.glassfish.jersey.inject - jersey-hk2 org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier diff --git a/testsuites/integration/integration-uservice-test/pom.xml b/testsuites/integration/integration-uservice-test/pom.xml index 8fff75d82..bfcfc4294 100644 --- a/testsuites/integration/integration-uservice-test/pom.xml +++ b/testsuites/integration/integration-uservice-test/pom.xml @@ -172,26 +172,12 @@ ${activemq-version} test - - - org.glassfish.jersey.core - jersey-client - org.awaitility awaitility 3.0.0 test - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.inject - jersey-hk2 - diff --git a/testsuites/performance/performance-benchmark-test/pom.xml b/testsuites/performance/performance-benchmark-test/pom.xml index 086b6612d..50292b057 100644 --- a/testsuites/performance/performance-benchmark-test/pom.xml +++ b/testsuites/performance/performance-benchmark-test/pom.xml @@ -36,22 +36,10 @@ services-engine ${project.version} - - org.glassfish.jersey.core - jersey-client - org.glassfish.jersey.containers jersey-container-grizzly2-http - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - org.glassfish.jersey.inject - jersey-hk2 - org.onap.policy.apex-pdp.testsuites.integration integration-common -- cgit 1.2.3-korg