From 7de29bfea89ff53a446bea07d8f74d1aaa87045b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 25 Nov 2020 08:29:23 -0500
Subject: Limit use of odlparent poms

Updated pom.xmls to use standard maven project structure (i.e. parent
of pom is pom in directory above), and updated top level pom to
use org.ccsdk.parent:oparent as parent - EXCEPT in cases where
module has true OpenDaylight dependencies and therefore needs
to use ODL parent pom.

Change-Id: I50429f28225152251ac2086235c14bb00f09c05c
Issue-ID: CCSDK-3001
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 plugins/restconf-client/installer/pom.xml | 6 +++---
 plugins/restconf-client/pom.xml           | 6 +++---
 plugins/restconf-client/provider/pom.xml  | 7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'plugins/restconf-client')

diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index 5b9ff7555..9a85acb74 100755
--- a/plugins/restconf-client/installer/pom.xml
+++ b/plugins/restconf-client/installer/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>restconf-client</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
index d3f833fd4..3b376562a 100755
--- a/plugins/restconf-client/pom.xml
+++ b/plugins/restconf-client/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
index 0baac7d44..66d05de10 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -5,7 +5,8 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -31,6 +32,10 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-sse</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-- 
cgit 1.2.3-korg