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/aai-service/installer/pom.xml | 7 +++----
 adaptors/aai-service/pom.xml           | 7 +++----
 adaptors/aai-service/provider/pom.xml  | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'adaptors/aai-service')

diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml
index 2611c7b05..9ec26b39b 100755
--- a/adaptors/aai-service/installer/pom.xml
+++ b/adaptors/aai-service/installer/pom.xml
@@ -3,10 +3,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>aai-service</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml
index a06c97291..638de3f67 100755
--- a/adaptors/aai-service/pom.xml
+++ b/adaptors/aai-service/pom.xml
@@ -3,10 +3,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>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml
index 6aee4a21b..e2c281af6 100755
--- a/adaptors/aai-service/provider/pom.xml
+++ b/adaptors/aai-service/provider/pom.xml
@@ -3,10 +3,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>aai-service</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-- 
cgit 1.2.3-korg