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>
---
 core/sliapi/installer/pom.xml     | 7 +++----
 core/sliapi/model/pom.xml         | 7 +++----
 core/sliapi/model/swagger/pom.xml | 6 +++---
 core/sliapi/model/yang/pom.xml    | 2 +-
 core/sliapi/pom.xml               | 7 +++----
 core/sliapi/provider/pom.xml      | 2 +-
 6 files changed, 14 insertions(+), 17 deletions(-)

(limited to 'core/sliapi')

diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml
index 5e11a3609..c442b052c 100755
--- a/core/sliapi/installer/pom.xml
+++ b/core/sliapi/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-SNAPSHOT</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.core</groupId>
+        <artifactId>sliapi</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml
index 20075e1e0..5c4425218 100755
--- a/core/sliapi/model/pom.xml
+++ b/core/sliapi/model/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-SNAPSHOT</version>
-		<relativePath/>
+		<groupId>org.onap.ccsdk.sli.core</groupId>
+		<artifactId>sliapi</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml
index eaa6d6039..dccfbc0a6 100644
--- a/core/sliapi/model/swagger/pom.xml
+++ b/core/sliapi/model/swagger/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.sli.core</groupId>
+        <artifactId>sliapi-model</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml
index 3a443e0e9..8e92af9da 100755
--- a/core/sliapi/model/yang/pom.xml
+++ b/core/sliapi/model/yang/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
+		<version>2.1.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml
index 8a8602ae5..789789624 100755
--- a/core/sliapi/pom.xml
+++ b/core/sliapi/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-SNAPSHOT</version>
-		<relativePath/>
+		<groupId>org.onap.ccsdk.sli.core</groupId>
+		<artifactId>core-root</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml
index 447c6ef0f..b9d1c9a67 100755
--- a/core/sliapi/provider/pom.xml
+++ b/core/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
-- 
cgit 1.2.3-korg