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

(limited to 'core/sliPluginUtils')

diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml
index f6f4d5588..11aa73c85 100755
--- a/core/sliPluginUtils/installer/pom.xml
+++ b/core/sliPluginUtils/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>sliPluginUtils</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml
index 4974d0003..971daed62 100755
--- a/core/sliPluginUtils/pom.xml
+++ b/core/sliPluginUtils/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/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml
index 393d982e4..63deccadd 100755
--- a/core/sliPluginUtils/provider/pom.xml
+++ b/core/sliPluginUtils/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-SNAPSHOT</version>
-		<relativePath/>
+		<groupId>org.onap.ccsdk.sli.core</groupId>
+		<artifactId>sliPluginUtils</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
-- 
cgit 1.2.3-korg