From d7eda87db76d8afafb59b88c2ca22e6e89cbada0 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@est.tech>
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 <liam.fallon@est.tech>
---
 client/client-deployment/pom.xml | 16 ++++------------
 client/client-editor/pom.xml     | 24 +++++++-----------------
 client/client-full/pom.xml       |  9 ---------
 client/client-monitoring/pom.xml | 12 ++++--------
 4 files changed, 15 insertions(+), 46 deletions(-)

(limited to 'client')

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 @@
     <description>Web client for deploying models in Apex engine</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>
@@ -41,18 +45,6 @@
             <groupId>org.glassfish.jersey.containers</groupId>
             <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>
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 @@
     <description>Web client for editing Apex policies</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>policy-endpoints</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>utils</artifactId>
@@ -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>
@@ -71,17 +72,6 @@
             <artifactId>junit</artifactId>
             <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>
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 @@
             <artifactId>client-deployment</artifactId>
             <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>
@@ -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>
@@ -41,14 +45,6 @@
             <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>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-- 
cgit 1.2.3-korg