From 5de81966f5574ae83e85aa7d5aa8865ea5deef24 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 26 Jan 2021 13:15:47 -0500
Subject: Revert "Limit use of odlparent poms"

This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b,
due to issues encountered in the odlsli container in ccsdk/distribution.

Issue-ID: CCSDK-3001
Issue-ID: CCSDK-3099
Change-Id: I79252b74693895f483eb390c575bb244195fe7ed
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  | 5 -----
 3 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'plugins/restconf-client')

diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index 9a85acb74..a0285405b 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.sli.plugins</groupId>
-        <artifactId>restconf-client</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-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 3b376562a..132c62dad 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.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-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 66d05de10..dbe16754f 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
         <version>2.1.1-SNAPSHOT</version>
-        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -32,10 +31,6 @@
             <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