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>
---
 adaptors/netbox-client/installer/pom.xml |  7 ++++---
 adaptors/netbox-client/pom.xml           |  7 ++++---
 adaptors/netbox-client/provider/pom.xml  | 10 +++++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'adaptors/netbox-client')

diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml
index bbc6d617a..470a61a1e 100755
--- a/adaptors/netbox-client/installer/pom.xml
+++ b/adaptors/netbox-client/installer/pom.xml
@@ -19,9 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <artifactId>netbox-client</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml
index 577912904..4b9fc7ffa 100644
--- a/adaptors/netbox-client/pom.xml
+++ b/adaptors/netbox-client/pom.xml
@@ -19,9 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <artifactId>adaptors-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml
index 0e84797cb..483e80868 100644
--- a/adaptors/netbox-client/provider/pom.xml
+++ b/adaptors/netbox-client/provider/pom.xml
@@ -19,9 +19,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <artifactId>netbox-client</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@ -47,14 +48,17 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
+            <version>${apache.httpcomponents.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <version>${apache.httpcomponents.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-- 
cgit 1.2.3-korg