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>
---
 adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml    | 7 +++----
 adaptors/ansible-adapter/ansible-adapter-installer/pom.xml | 7 +++----
 adaptors/ansible-adapter/pom.xml                           | 9 ++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'adaptors/ansible-adapter')

diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
index d27c417e8..382533826 100644
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -17,10 +17,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>ansible-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
index eb6726c54..8a555dd11 100644
--- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -27,10 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>ansible-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml
index a46493dca..934cc0b24 100644
--- a/adaptors/ansible-adapter/pom.xml
+++ b/adaptors/ansible-adapter/pom.xml
@@ -27,14 +27,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.1.0</version>
-    <relativePath/>
+    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+    <artifactId>adaptors-root</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-  <artifactId>ansible-adaptor</artifactId>
+  <artifactId>ansible-adapter</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
-- 
cgit 1.2.3-korg