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>
---
 plugins/features/ccsdk-gr-toolkit/pom.xml        | 7 ++++---
 plugins/features/ccsdk-properties-node/pom.xml   | 7 ++++---
 plugins/features/ccsdk-restapi-call-node/pom.xml | 7 ++++---
 plugins/features/ccsdk-restconf-client/pom.xml   | 7 ++++---
 plugins/features/ccsdk-sli-plugins-all/pom.xml   | 7 ++++---
 plugins/features/ccsdk-sshapi-call-node/pom.xml  | 7 ++++---
 plugins/features/ccsdk-template-node/pom.xml     | 7 ++++---
 plugins/features/installer/pom.xml               | 7 ++++---
 plugins/features/pom.xml                         | 2 +-
 9 files changed, 33 insertions(+), 25 deletions(-)

(limited to 'plugins/features')

diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml
index 2f99aa6e5..9dbb80ebf 100644
--- a/plugins/features/ccsdk-gr-toolkit/pom.xml
+++ b/plugins/features/ccsdk-gr-toolkit/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml
index 26632286e..3caffcd42 100644
--- a/plugins/features/ccsdk-properties-node/pom.xml
+++ b/plugins/features/ccsdk-properties-node/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml
index 03bb475b6..217071c08 100644
--- a/plugins/features/ccsdk-restapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-restapi-call-node/pom.xml
@@ -3,9 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml
index c3d742294..bf4994b33 100644
--- a/plugins/features/ccsdk-restconf-client/pom.xml
+++ b/plugins/features/ccsdk-restconf-client/pom.xml
@@ -3,9 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml
index 316a72b14..d94d0e506 100644
--- a/plugins/features/ccsdk-sli-plugins-all/pom.xml
+++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml
@@ -3,9 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml
index bd0f16b57..aa0af70f8 100644
--- a/plugins/features/ccsdk-sshapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml
index 45daca5a6..631812825 100644
--- a/plugins/features/ccsdk-template-node/pom.xml
+++ b/plugins/features/ccsdk-template-node/pom.xml
@@ -3,9 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml
index ce5f1ed58..162a51545 100755
--- a/plugins/features/installer/pom.xml
+++ b/plugins/features/installer/pom.xml
@@ -3,9 +3,10 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sliplugins-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.plugins</groupId>
diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml
index 6e0f2227e..d6ea3c538 100755
--- a/plugins/features/pom.xml
+++ b/plugins/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