diff options
| -rw-r--r-- | client/client-deployment/pom.xml | 16 | ||||
| -rw-r--r-- | client/client-editor/pom.xml | 24 | ||||
| -rw-r--r-- | client/client-full/pom.xml | 9 | ||||
| -rw-r--r-- | client/client-monitoring/pom.xml | 12 | ||||
| -rw-r--r-- | examples/examples-decisionmaker/pom.xml | 10 | ||||
| -rw-r--r-- | examples/examples-onap-bbs/pom.xml | 10 | ||||
| -rw-r--r-- | examples/examples-onap-vcpe/pom.xml | 5 | ||||
| -rw-r--r-- | examples/examples-servlet/pom.xml | 4 | ||||
| -rw-r--r-- | plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restclient/pom.xml | 4 | ||||
| -rw-r--r-- | plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/pom.xml | 24 | ||||
| -rw-r--r-- | plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restserver/pom.xml | 8 | ||||
| -rw-r--r-- | services/services-onappf/pom.xml | 38 | ||||
| -rw-r--r-- | testsuites/integration/integration-uservice-test/pom.xml | 14 | ||||
| -rw-r--r-- | testsuites/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 @@ -33,6 +33,10 @@ <dependencies> <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>policy-endpoints</artifactId> + </dependency> + <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core-deployment</artifactId> <version>${project.version}</version> @@ -42,18 +46,6 @@ <artifactId>jersey-container-grizzly2-http</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-multipart</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - </dependency> - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> 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 @@ -34,6 +34,10 @@ <dependencies> <dependency> <groupId>org.onap.policy.common</groupId> + <artifactId>policy-endpoints</artifactId> + </dependency> + <dependency> + <groupId>org.onap.policy.common</groupId> <artifactId>utils</artifactId> </dependency> <dependency> @@ -55,12 +59,9 @@ <artifactId>jersey-media-moxy</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> + <groupId>org.glassfish.jersey.test-framework.providers</groupId> + <artifactId>jersey-test-framework-provider-grizzly2</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-cli</groupId> @@ -72,17 +73,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.test-framework</groupId> - <artifactId>jersey-test-framework-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.test-framework.providers</groupId> - <artifactId>jersey-test-framework-provider-grizzly2</artifactId> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client-common</artifactId> <version>${project.version}</version> 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 @@ -48,12 +48,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-http</artifactId> - </dependency> - - - <dependency> <groupId>org.onap.policy.apex-pdp.client</groupId> <artifactId>client-monitoring</artifactId> <version>${project.version}</version> @@ -82,9 +76,6 @@ <artifactId>assertj-core</artifactId> <scope>test</scope> </dependency> - - - </dependencies> <build> 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 @@ <description>Web client for monitoring Apex engines</description> <dependencies> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>policy-endpoints</artifactId> + </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.core</groupId> <artifactId>core-deployment</artifactId> @@ -42,14 +46,6 @@ <artifactId>jersey-container-grizzly2-http</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - </dependency> - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> 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 @@ -49,16 +49,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-http</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId> <artifactId>plugins-context-schema-avro</artifactId> <version>${project.version}</version> 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 @@ -50,16 +50,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-http</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId> <artifactId>plugins-context-schema-avro</artifactId> <version>${project.version}</version> 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 @@ -50,11 +50,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-context.plugins-context-schema</groupId> <artifactId>plugins-context-schema-avro</artifactId> <version>${project.version}</version> 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 @@ -37,10 +37,6 @@ <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.services</groupId> <artifactId>services-engine</artifactId> <version>${project.version}</version> 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 @@ -33,10 +33,6 @@ <dependencies> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.services</groupId> <artifactId>services-engine</artifactId> <version>${project.version}</version> 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,8 +32,9 @@ <dependencies> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> + <groupId>org.onap.policy.common</groupId> + <artifactId>policy-endpoints</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.services</groupId> @@ -41,30 +42,11 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-grizzly2-http</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-executor</groupId> <artifactId>plugins-executor-javascript</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.common</groupId> - <artifactId>policy-endpoints</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> </dependencies> <profiles> 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 @@ -37,18 +37,10 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> </dependency> 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 @@ <dependency> <groupId>org.onap.policy.common</groupId> <artifactId>policy-endpoints</artifactId> - <exclusions> - <exclusion> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-jetty-http</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-server</artifactId> - </exclusion> - <exclusion> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.hk2</groupId> - <artifactId>hk2-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>javax.inject</artifactId> - </exclusion> - <exclusion> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> </dependency> <dependency> <groupId>org.onap.policy.apex-pdp.plugins.plugins-event.plugins-event-carrier</groupId> 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 @@ <version>${activemq-version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> <dependency> <groupId>org.awaitility</groupId> <artifactId>awaitility</artifactId> <version>3.0.0</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - </dependency> </dependencies> <build> 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 @@ -37,22 +37,10 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - </dependency> - <dependency> <groupId>org.glassfish.jersey.containers</groupId> <artifactId>jersey-container-grizzly2-http</artifactId> </dependency> <dependency> - <groupId>org.glassfish.jersey.containers</groupId> - <artifactId>jersey-container-servlet-core</artifactId> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.inject</groupId> - <artifactId>jersey-hk2</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.apex-pdp.testsuites.integration</groupId> <artifactId>integration-common</artifactId> <version>${project.version}</version> |