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>

28 files changed, 91 insertions, 86 deletions

diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml
index 2ce23f61d..bfe4130c3 100755
--- a/plugins/artifacts/pom.xml
+++ b/plugins/artifacts/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>plugins-root</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+  <groupId>org.onap.ccsdk.parent</groupId>
+  <artifactId>parent</artifactId>
+  <version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
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>
diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml
index 2dbabd930..9bad87c78 100755
--- a/plugins/grToolkit/installer/pom.xml
+++ b/plugins/grToolkit/installer/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>gr-toolkit</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/grToolkit/pom.xml b/plugins/grToolkit/pom.xml
index 7bb5e0485..a1908945c 100755
--- a/plugins/grToolkit/pom.xml
+++ b/plugins/grToolkit/pom.xml
@@ -3,9 +3,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</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/pom.xml b/plugins/pom.xml
index 79a508b45..f8245f29c 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli</groupId>
-        <artifactId>sli-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
-    <artifactId>plugins-root</artifactId>
+    <artifactId>ccsdk-sli-plugins</artifactId>
     <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml
index 8ffa0198c..5807e0d5f 100755
--- a/plugins/properties-node/installer/pom.xml
+++ b/plugins/properties-node/installer/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>properties-node</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml
index c0600d31c..1aa8da24b 100755
--- a/plugins/properties-node/pom.xml
+++ b/plugins/properties-node/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml
index ea2dddd16..a8e4e4db1 100755
--- a/plugins/properties-node/provider/pom.xml
+++ b/plugins/properties-node/provider/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>properties-node</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml
index fa3d93a6d..f9be5146d 100755
--- a/plugins/restapi-call-node/installer/pom.xml
+++ b/plugins/restapi-call-node/installer/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>restapi-call-node</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml
index 05ada5f3b..9d6918979 100755
--- a/plugins/restapi-call-node/pom.xml
+++ b/plugins/restapi-call-node/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml
index 86e282361..a2ee45161 100755
--- a/plugins/restapi-call-node/provider/pom.xml
+++ b/plugins/restapi-call-node/provider/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>restapi-call-node</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml
index 9a85acb74..a0285405b 100755
--- a/plugins/restconf-client/installer/pom.xml
+++ b/plugins/restconf-client/installer/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>restconf-client</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml
index 3b376562a..132c62dad 100755
--- a/plugins/restconf-client/pom.xml
+++ b/plugins/restconf-client/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml
index 66d05de10..dbe16754f 100755
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -6,7 +6,6 @@
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
         <version>2.1.1-SNAPSHOT</version>
-        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -33,10 +32,6 @@
             <artifactId>jersey-media-sse</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-        </dependency>
-        <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
         </dependency>
diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml
index d4b613ba2..a5c71a72e 100755
--- a/plugins/sshapi-call-node/installer/pom.xml
+++ b/plugins/sshapi-call-node/installer/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>sshapi-call-node</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml
index e3e714d9c..c3bc7ecaa 100755
--- a/plugins/sshapi-call-node/pom.xml
+++ b/plugins/sshapi-call-node/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml
index d48b4a97c..5dee60395 100755
--- a/plugins/sshapi-call-node/provider/pom.xml
+++ b/plugins/sshapi-call-node/provider/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>sshapi-call-node</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml
index 42d295bd3..6c2fdd798 100644
--- a/plugins/template-node/installer/pom.xml
+++ b/plugins/template-node/installer/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>template-node</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>odlparent-lite</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml
index cb0f48321..55e233e8b 100644
--- a/plugins/template-node/pom.xml
+++ b/plugins/template-node/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.sli.plugins</groupId>
-        <artifactId>plugins-root</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml
index 930afef7d..7ae8e6d4d 100644
--- a/plugins/template-node/provider/pom.xml
+++ b/plugins/template-node/provider/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<artifactId>template-node</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>2.1.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -43,7 +43,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity-engine-core</artifactId>
+			<artifactId>velocity</artifactId>
 		</dependency>
 	</dependencies>
 </project>