From 5de81966f5574ae83e85aa7d5aa8865ea5deef24 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 26 Jan 2021 13:15:47 -0500
Subject: Revert "Limit use of odlparent poms"

This reverts commit 7de29bfea89ff53a446bea07d8f74d1aaa87045b,
due to issues encountered in the odlsli container in ccsdk/distribution.

Issue-ID: CCSDK-3001
Issue-ID: CCSDK-3099
Change-Id: I79252b74693895f483eb390c575bb244195fe7ed
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 northbound/features/ccsdk-asdcApi/pom.xml               | 7 ++++---
 northbound/features/ccsdk-daexim-offsite-backup/pom.xml | 7 ++++---
 northbound/features/ccsdk-dataChange/pom.xml            | 7 ++++---
 northbound/features/ccsdk-lcm/pom.xml                   | 7 ++++---
 northbound/features/ccsdk-sli-northbound-all/pom.xml    | 7 ++++---
 northbound/features/installer/pom.xml                   | 7 ++++---
 northbound/features/pom.xml                             | 2 +-
 7 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'northbound/features')

diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml
index c33a2ce8a..eef81ba51 100644
--- a/northbound/features/ccsdk-asdcApi/pom.xml
+++ b/northbound/features/ccsdk-asdcApi/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
index 31f6010df..5bcb1822f 100644
--- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
+++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml
index 0f6850768..4a62b1d2e 100644
--- a/northbound/features/ccsdk-dataChange/pom.xml
+++ b/northbound/features/ccsdk-dataChange/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml
index cde3cc8f5..3c24a7922 100644
--- a/northbound/features/ccsdk-lcm/pom.xml
+++ b/northbound/features/ccsdk-lcm/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml
index 6302aacf4..4fd04b113 100644
--- a/northbound/features/ccsdk-sli-northbound-all/pom.xml
+++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml
index f175832a1..1b7783b2a 100755
--- a/northbound/features/installer/pom.xml
+++ b/northbound/features/installer/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.northbound</groupId>
-        <artifactId>slinorthbound-feature-aggregator</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml
index 7f59f5824..4de0fe76a 100755
--- a/northbound/features/pom.xml
+++ b/northbound/features/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
+        <artifactId>odlparent-lite</artifactId>
         <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
-- 
cgit 1.2.3-korg