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

(limited to 'core/utils')

diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml
index 80e4072f8..17bbbcf54 100755
--- a/core/utils/installer/pom.xml
+++ b/core/utils/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>utils</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
diff --git a/core/utils/pom.xml b/core/utils/pom.xml
index a204f8175..d2fe753af 100755
--- a/core/utils/pom.xml
+++ b/core/utils/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/utils/provider/pom.xml b/core/utils/provider/pom.xml
index 8d3a785f4..02bf84d0c 100644
--- a/core/utils/provider/pom.xml
+++ b/core/utils/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>utils</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -31,7 +30,7 @@
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
 			<scope>provided</scope>
-		</dependency>
+        </dependency>
 
         <!-- Testing Dependencies -->
         <dependency>
@@ -42,7 +41,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
-- 
cgit 1.2.3-korg