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>

diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml
index 2611c7b..9ec26b3 100755 (executable)
--- a/adaptors/aai-service/installer/pom.xml
+++ b/adaptors/aai-service/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>aai-service</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml
index a06c972..638de3f 100755 (executable)
--- a/adaptors/aai-service/pom.xml
+++ b/adaptors/aai-service/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml
index 6aee4a2..e2c281a 100755 (executable)
--- a/adaptors/aai-service/provider/pom.xml
+++ b/adaptors/aai-service/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>aai-service</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
index d27c417..3825338 100644 (file)
--- a/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/adaptors/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -17,10 +17,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>ansible-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
index eb6726c..8a555dd 100644 (file)
--- a/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
+++ b/adaptors/ansible-adapter/ansible-adapter-installer/pom.xml
@@ -27,10 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>ansible-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/ansible-adapter/pom.xml b/adaptors/ansible-adapter/pom.xml
index a46493d..934cc0b 100644 (file)
--- a/adaptors/ansible-adapter/pom.xml
+++ b/adaptors/ansible-adapter/pom.xml
@@ -27,14 +27,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>2.1.0</version>
-    <relativePath/>
+    <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+    <artifactId>adaptors-root</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-  <artifactId>ansible-adaptor</artifactId>
+  <artifactId>ansible-adapter</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml
index e55c809..df33d7d 100755 (executable)
--- a/adaptors/artifacts/pom.xml
+++ b/adaptors/artifacts/pom.xml
@@ -3,9 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>parent</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+               <artifactId>adaptors-root</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml
index bed3252..0322a9f 100644 (file)
--- a/adaptors/base/http/installer/pom.xml
+++ b/adaptors/base/http/installer/pom.xml
@@ -3,9 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.adaptors.base</groupId>
+               <artifactId>http</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml
index d33eeed..f092b44 100644 (file)
--- a/adaptors/base/http/pom.xml
+++ b/adaptors/base/http/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>base-parent</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors.base</groupId>

diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml
index 5f21a8a..c4b1e73 100644 (file)
--- a/adaptors/base/http/provider/pom.xml
+++ b/adaptors/base/http/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</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.adaptors.base</groupId>
+               <artifactId>http</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml
index 6f5cb21..daa11e3 100644 (file)
--- a/adaptors/base/pom.xml
+++ b/adaptors/base/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
      </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml
index 9f99a71..dce8adf 100644 (file)
--- a/adaptors/features/ccsdk-aai-service/pom.xml
+++ b/adaptors/features/ccsdk-aai-service/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml
index f68826c..a347239 100644 (file)
--- a/adaptors/features/ccsdk-ansible-adapter/pom.xml
+++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml
index 67ac058..e1a60c5 100644 (file)
--- a/adaptors/features/ccsdk-base-http/pom.xml
+++ b/adaptors/features/ccsdk-base-http/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml
index f3ee919..cd7d1e4 100644 (file)
--- a/adaptors/features/ccsdk-mdsal-resource/pom.xml
+++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
index 1eaa156..b555632 100755 (executable)
--- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
+++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml
@@ -3,9 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>

diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
index 43fa9b2..cb1c495 100755 (executable)
--- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
+++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml
@@ -3,9 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>

diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml
index 8dadba9..6198aca 100644 (file)
--- a/adaptors/features/ccsdk-netbox-client/pom.xml
+++ b/adaptors/features/ccsdk-netbox-client/pom.xml
@@ -19,10 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml
index 024deea..b305e90 100644 (file)
--- a/adaptors/features/ccsdk-resource-assignment/pom.xml
+++ b/adaptors/features/ccsdk-resource-assignment/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml
index 153bb9b..0bb9ccd 100644 (file)
--- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml
+++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
index 6e80ed9..7610f28 100644 (file)
--- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml
index 50cddba..a0a5bc7 100644 (file)
--- a/adaptors/features/ccsdk-sql-resource/pom.xml
+++ b/adaptors/features/ccsdk-sql-resource/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml
index ddb0efa..6cddd4b 100644 (file)
--- a/adaptors/features/features-sli-adaptors/pom.xml
+++ b/adaptors/features/features-sli-adaptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml
index 385bc6e..660f037 100755 (executable)
--- a/adaptors/features/installer/pom.xml
+++ b/adaptors/features/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</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sliadaptors-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml
index d8cda45..c368f22 100755 (executable)
--- a/adaptors/features/pom.xml
+++ b/adaptors/features/pom.xml
@@ -4,8 +4,8 @@
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <artifactId>single-feature-parent</artifactId>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml
index 2fa1a09..9aa35a7 100755 (executable)
--- a/adaptors/mdsal-resource/installer/pom.xml
+++ b/adaptors/mdsal-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>mdsal-resource</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml
index 1969ab1..fd3d8d6 100755 (executable)
--- a/adaptors/mdsal-resource/pom.xml
+++ b/adaptors/mdsal-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml
index 5cd1384..8017689 100755 (executable)
--- a/adaptors/mdsal-resource/provider/pom.xml
+++ b/adaptors/mdsal-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>mdsal-resource</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml
index 74d77db..7aeda3e 100755 (executable)
--- a/adaptors/message-router/pom.xml
+++ b/adaptors/message-router/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
        <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>

diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml
index 1d434a0..bbc6d61 100755 (executable)
--- a/adaptors/netbox-client/installer/pom.xml
+++ b/adaptors/netbox-client/installer/pom.xml
@@ -19,10 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>netbox-client</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml
index 0f20197..5779129 100644 (file)
--- a/adaptors/netbox-client/pom.xml
+++ b/adaptors/netbox-client/pom.xml
@@ -19,10 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml
index bbad98a..0e84797 100644 (file)
--- a/adaptors/netbox-client/provider/pom.xml
+++ b/adaptors/netbox-client/provider/pom.xml
@@ -19,10 +19,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>netbox-client</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
@@ -48,17 +47,14 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>${gson.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>${apache.httpcomponents.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${apache.httpcomponents.client.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/adaptors/pom.xml b/adaptors/pom.xml
index 379c4e1..a61d2cd 100755 (executable)
--- a/adaptors/pom.xml
+++ b/adaptors/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli</groupId>
+        <artifactId>sli-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-    <artifactId>ccsdk-sli-adaptors</artifactId>
+    <artifactId>adaptors-root</artifactId>
     <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 

diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml
index 37abc05..7a7e39d 100755 (executable)
--- a/adaptors/resource-assignment/installer/pom.xml
+++ b/adaptors/resource-assignment/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>resource-assignment</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml
index c06bcdd..9a3ad35 100755 (executable)
--- a/adaptors/resource-assignment/pom.xml
+++ b/adaptors/resource-assignment/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml
index 7c3af58..084766d 100755 (executable)
--- a/adaptors/resource-assignment/provider/pom.xml
+++ b/adaptors/resource-assignment/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>resource-assignment</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/saltstack-adapter/pom.xml b/adaptors/saltstack-adapter/pom.xml
index e94262e..43c9571 100644 (file)
--- a/adaptors/saltstack-adapter/pom.xml
+++ b/adaptors/saltstack-adapter/pom.xml
@@ -27,14 +27,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-    <artifactId>saltstack-adaptor</artifactId>
+    <artifactId>saltstack-adapter</artifactId>
     <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 

diff --git a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml
index 895fec3..810c51b 100644 (file)
--- a/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml
+++ b/adaptors/saltstack-adapter/saltstack-adapter-installer/pom.xml
@@ -27,10 +27,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>saltstack-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
index fc697d4..7088e2b 100644 (file)
--- a/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
+++ b/adaptors/saltstack-adapter/saltstack-adapter-provider/pom.xml
@@ -16,10 +16,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>saltstack-adapter</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml
index 44497a0..aa38a74 100755 (executable)
--- a/adaptors/sql-resource/installer/pom.xml
+++ b/adaptors/sql-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sql-resource</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml
index e448e84..5879242 100755 (executable)
--- a/adaptors/sql-resource/pom.xml
+++ b/adaptors/sql-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>adaptors-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml
index 0d89bdf..26ccd65 100755 (executable)
--- a/adaptors/sql-resource/provider/pom.xml
+++ b/adaptors/sql-resource/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+        <artifactId>sql-resource</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>

diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml
index 7a42521..25990a3 100755 (executable)
--- a/core/artifacts/pom.xml
+++ b/core/artifacts/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>parent</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/dblib/installer/pom.xml b/core/dblib/installer/pom.xml
index b97d11c..40f6bfb 100755 (executable)
--- a/core/dblib/installer/pom.xml
+++ b/core/dblib/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>dblib</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml
index efe43e1..81edb0f 100755 (executable)
--- a/core/dblib/pom.xml
+++ b/core/dblib/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/dblib/provider/pom.xml b/core/dblib/provider/pom.xml
index 224f53a..d4f26b5 100755 (executable)
--- a/core/dblib/provider/pom.xml
+++ b/core/dblib/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>dblib</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml
index 7053099..469b944 100644 (file)
--- a/core/features/ccsdk-dblib/pom.xml
+++ b/core/features/ccsdk-dblib/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml
index 0a3f9af..bce946f 100644 (file)
--- a/core/features/ccsdk-filters/pom.xml
+++ b/core/features/ccsdk-filters/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml
index 984484e..5fd7cbc 100644 (file)
--- a/core/features/ccsdk-sli-core-all/pom.xml
+++ b/core/features/ccsdk-sli-core-all/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml
index 5521d62..70d712b 100644 (file)
--- a/core/features/ccsdk-sli/pom.xml
+++ b/core/features/ccsdk-sli/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml
index 04e76b4..b27d49c 100644 (file)
--- a/core/features/ccsdk-sliPluginUtils/pom.xml
+++ b/core/features/ccsdk-sliPluginUtils/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml
index 3a026e2..bb52181 100644 (file)
--- a/core/features/ccsdk-sliapi/pom.xml
+++ b/core/features/ccsdk-sliapi/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml
index bbba2b0..25e5a18 100644 (file)
--- a/core/features/ccsdk-slicore-utils/pom.xml
+++ b/core/features/ccsdk-slicore-utils/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-        <relativePath/>
+               <groupId>org.onap.ccsdk.sli.core</groupId>
+               <artifactId>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml
index e0502fe..96c56de 100644 (file)
--- a/core/features/features-sli-core/pom.xml
+++ b/core/features/features-sli-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml
index 53acc26..41e09ca 100755 (executable)
--- a/core/features/installer/pom.xml
+++ b/core/features/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>slicore-feature-aggregator</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/features/pom.xml b/core/features/pom.xml
index 9018b17..8fab8d6 100755 (executable)
--- a/core/features/pom.xml
+++ b/core/features/pom.xml
@@ -4,9 +4,8 @@
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
-               <relativePath/>
+               <artifactId>single-feature-parent</artifactId>
+               <version>2.1.1-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml
index 56a8692..c94c188 100755 (executable)
--- a/core/filters/installer/pom.xml
+++ b/core/filters/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>filters</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/filters/pom.xml b/core/filters/pom.xml
index 9549ccd..42d40fc 100644 (file)
--- a/core/filters/pom.xml
+++ b/core/filters/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/filters/provider/pom.xml b/core/filters/provider/pom.xml
index 657e500..6b2dabe 100755 (executable)
--- a/core/filters/provider/pom.xml
+++ b/core/filters/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>filters</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
@@ -25,5 +24,10 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

diff --git a/core/pom.xml b/core/pom.xml
index d53f5a8..d74d84b 100755 (executable)
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -3,14 +3,13 @@
        <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</groupId>
+               <artifactId>sli-root</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>
-       <artifactId>ccsdk-sli-core</artifactId>
+       <artifactId>core-root</artifactId>
        <version>1.2.0-SNAPSHOT</version>
        <packaging>pom</packaging>
 
@@ -22,7 +21,7 @@
        </organization>
 
        <modules>
-        <module>utils</module>
+               <module>utils</module>
                <module>dblib</module>
                <module>sli</module>
                <module>filters</module>
@@ -58,27 +57,27 @@
                                </property>
                        </activation>
                        <build>
-                                       <plugins>
-                                               <plugin>
-                                                       <groupId>com.blackducksoftware.integration</groupId>
-                                                       <artifactId>hub-maven-plugin</artifactId>
-                                                       <version>1.4.0</version>
-                                                       <inherited>false</inherited>
-                                                       <configuration>
-                                                               <hubProjectName>${project.name}</hubProjectName>
-                                                               <outputDirectory>${project.basedir}</outputDirectory>
-                                                       </configuration>
-                                                       <executions>
-                                                               <execution>
-                                                                       <id>create-bdio-file</id>
-                                                                       <phase>package</phase>
-                                                                       <goals>
-                                                                               <goal>createHubOutput</goal>
-                                                                       </goals>
-                                                               </execution>
-                                                       </executions>
-                                               </plugin>
-                                       </plugins>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>com.blackducksoftware.integration</groupId>
+                                               <artifactId>hub-maven-plugin</artifactId>
+                                               <version>1.4.0</version>
+                                               <inherited>false</inherited>
+                                               <configuration>
+                                                       <hubProjectName>${project.name}</hubProjectName>
+                                                       <outputDirectory>${project.basedir}</outputDirectory>
+                                               </configuration>
+                                               <executions>
+                                                       <execution>
+                                                               <id>create-bdio-file</id>
+                                                               <phase>package</phase>
+                                                               <goals>
+                                                                       <goal>createHubOutput</goal>
+                                                               </goals>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
                        </build>
 
                </profile>

diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml
index 748488b..62b7e55 100755 (executable)
--- a/core/sli/common/pom.xml
+++ b/core/sli/common/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>sli</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml
index 02b5c1d..2a9a8da 100755 (executable)
--- a/core/sli/installer/pom.xml
+++ b/core/sli/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>sli</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml
index fbdb982..acff526 100755 (executable)
--- a/core/sli/model/pom.xml
+++ b/core/sli/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/core/sli/pom.xml b/core/sli/pom.xml
index 7487364..3cb835b 100755 (executable)
--- a/core/sli/pom.xml
+++ b/core/sli/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/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml
index 671c061..5eac2c7 100644 (file)
--- a/core/sli/provider-base/pom.xml
+++ b/core/sli/provider-base/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>sli</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml
index 7ad437d..1fde267 100755 (executable)
--- a/core/sli/provider/pom.xml
+++ b/core/sli/provider/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml
index f6f4d55..11aa73c 100755 (executable)
--- 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 4974d00..971daed 100755 (executable)
--- 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 393d982..63decca 100755 (executable)
--- 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>

diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml
index 5e11a36..c442b05 100755 (executable)
--- a/core/sliapi/installer/pom.xml
+++ b/core/sliapi/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>sliapi</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml
index 20075e1..5c44252 100755 (executable)
--- a/core/sliapi/model/pom.xml
+++ b/core/sliapi/model/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>sliapi</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml
index eaa6d60..dccfbc0 100644 (file)
--- a/core/sliapi/model/swagger/pom.xml
+++ b/core/sliapi/model/swagger/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.sli.core</groupId>
+        <artifactId>sliapi-model</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>

diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml
index 3a443e0..8e92af9 100755 (executable)
--- a/core/sliapi/model/yang/pom.xml
+++ b/core/sliapi/model/yang/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>binding-parent</artifactId>
-               <version>2.1.0-SNAPSHOT</version>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml
index 8a8602a..7897896 100755 (executable)
--- a/core/sliapi/pom.xml
+++ b/core/sliapi/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/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml
index 447c6ef..b9d1c9a 100755 (executable)
--- a/core/sliapi/provider/pom.xml
+++ b/core/sliapi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml
index 80e4072..17bbbcf 100755 (executable)
--- 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 a204f81..d2fe753 100755 (executable)
--- 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 8d3a785..02bf84d 100644 (file)
--- 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>

diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml
index fc3496e..4cfa8c9 100755 (executable)
--- a/northbound/artifacts/pom.xml
+++ b/northbound/artifacts/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>parent</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml
index e5d5f2c..f8d3eae 100755 (executable)
--- a/northbound/asdcApi/installer/pom.xml
+++ b/northbound/asdcApi/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</version>
-               <relativePath/>
+               <groupId>org.onap.ccsdk.sli.northbound</groupId>
+               <artifactId>asdcApi</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml
index a31cd30..6796e71 100755 (executable)
--- a/northbound/asdcApi/model/pom.xml
+++ b/northbound/asdcApi/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml
index 9dfe297..8bd4828 100755 (executable)
--- a/northbound/asdcApi/pom.xml
+++ b/northbound/asdcApi/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml
index a308ff5..19e5660 100755 (executable)
--- a/northbound/asdcApi/provider/pom.xml
+++ b/northbound/asdcApi/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml
index 7689471..bff0096 100755 (executable)
--- a/northbound/daexim-offsite-backup/installer/pom.xml
+++ b/northbound/daexim-offsite-backup/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>daexim-offsite-backup</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml
index 17ca5b2..ff9a12d 100755 (executable)
--- a/northbound/daexim-offsite-backup/model/pom.xml
+++ b/northbound/daexim-offsite-backup/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml
index 05d8451..e6a0a8d 100755 (executable)
--- a/northbound/daexim-offsite-backup/pom.xml
+++ b/northbound/daexim-offsite-backup/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml
index 265f207..a600cdb 100755 (executable)
--- a/northbound/daexim-offsite-backup/provider/pom.xml
+++ b/northbound/daexim-offsite-backup/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -54,12 +54,12 @@
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
               <groupId>com.google.code.findbugs</groupId>

diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml
index 74c131b..3a30086 100755 (executable)
--- a/northbound/dataChange/installer/pom.xml
+++ b/northbound/dataChange/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>dataChange</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml
index 1e82026..59effb0 100755 (executable)
--- a/northbound/dataChange/model/pom.xml
+++ b/northbound/dataChange/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml
index d8642bc..b642ad1 100755 (executable)
--- a/northbound/dataChange/pom.xml
+++ b/northbound/dataChange/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml
index 5c4d259..b136989 100755 (executable)
--- a/northbound/dataChange/provider/pom.xml
+++ b/northbound/dataChange/provider/pom.xml
@@ -5,8 +5,8 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
@@ -17,15 +17,15 @@
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
 
     <dependencyManagement>
-       <dependencies>
-               <dependency>
-  <groupId>org.onap.ccsdk.sli.core</groupId>
-  <artifactId>sli-core-artifacts</artifactId>
-  <version>${project.version}</version>
-  <type>pom</type>
-  <scope>import</scope>
-               </dependency>
-       </dependencies>
+        <dependencies>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-core-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
     <dependencies>
         <dependency>

diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml
index fcc0696..fb07249 100755 (executable)
--- a/northbound/dmaap-listener/pom.xml
+++ b/northbound/dmaap-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>standalone-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
@@ -23,6 +23,8 @@
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
+        <!-- dmaap client requires an older jersey version -->
+        <jersey.version>2.22.1</jersey.version>
 
     </properties>
 
@@ -49,6 +51,7 @@
         <dependency>
             <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
             <artifactId>dmaapClient</artifactId>
+            <version>1.1.12</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -70,10 +73,28 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+
+               <dependency>
+                       <groupId>org.glassfish.jersey.core</groupId>
+                       <artifactId>jersey-common</artifactId>
+                       <version>${jersey.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.glassfish.jersey.core</groupId>
+                       <artifactId>jersey-client</artifactId>
+                       <version>${jersey.version}</version>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.glassfish.jersey.media</groupId>
+                       <artifactId>jersey-media-json-jackson</artifactId>
+                       <version>${jersey.version}</version>
+               </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
-        </dependency>        
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
index ee8bb4d..6092512 100644 (file)
--- a/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
+++ b/northbound/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncDmaapConsumerImpl.java
@@ -27,9 +27,9 @@ import java.io.FileInputStream;
 import java.util.Properties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import com.att.nsa.mr.client.MRClientFactory;
-import com.att.nsa.mr.client.MRConsumer;
-import com.att.nsa.mr.client.response.MRConsumerResponse;
+import org.onap.dmaap.mr.client.MRClientFactory;
+import org.onap.dmaap.mr.client.MRConsumer;
+import org.onap.dmaap.mr.client.response.MRConsumerResponse;
 
 public abstract class SdncDmaapConsumerImpl implements SdncDmaapConsumer {
 

diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml
index 799d499..c33a2ce 100644 (file)
--- a/northbound/features/ccsdk-asdcApi/pom.xml
+++ b/northbound/features/ccsdk-asdcApi/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 932c55a..31f6010 100644 (file)
--- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
+++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 4d6aec7..0f68507 100644 (file)
--- a/northbound/features/ccsdk-dataChange/pom.xml
+++ b/northbound/features/ccsdk-dataChange/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 aef5e16..cde3cc8 100644 (file)
--- a/northbound/features/ccsdk-lcm/pom.xml
+++ b/northbound/features/ccsdk-lcm/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 75675e3..6302aac 100644 (file)
--- a/northbound/features/ccsdk-sli-northbound-all/pom.xml
+++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml
index 6afb797..77b6e2f 100644 (file)
--- a/northbound/features/features-sli-northbound/pom.xml
+++ b/northbound/features/features-sli-northbound/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml
index be23e60..f175832 100755 (executable)
--- a/northbound/features/installer/pom.xml
+++ b/northbound/features/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>slinorthbound-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml
index 6982508..7f59f58 100755 (executable)
--- a/northbound/features/pom.xml
+++ b/northbound/features/pom.xml
@@ -4,8 +4,8 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <artifactId>single-feature-parent</artifactId>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml
index 3601a31..9b38006 100755 (executable)
--- a/northbound/lcm/installer/pom.xml
+++ b/northbound/lcm/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>lcm</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml
index c86b9ca..6f2c1f2 100755 (executable)
--- a/northbound/lcm/model/pom.xml
+++ b/northbound/lcm/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml
index b0898e4..3e9e655 100755 (executable)
--- a/northbound/lcm/pom.xml
+++ b/northbound/lcm/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml
index 0414f8f..5c32d45 100755 (executable)
--- a/northbound/lcm/provider/pom.xml
+++ b/northbound/lcm/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/northbound/pom.xml b/northbound/pom.xml
index a67afc5..475ad22 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli</groupId>
+        <artifactId>sli-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
-    <artifactId>ccsdk-sli-northbound</artifactId>
+    <artifactId>northbound-root</artifactId>
     <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 

diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml
index cd94297..cf6048f 100755 (executable)
--- a/northbound/ueb-listener/pom.xml
+++ b/northbound/ueb-listener/pom.xml
@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>standalone-parent</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.northbound</groupId>
+        <artifactId>northbound-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>

diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml
index c57b938..2ce23f6 100755 (executable)
--- a/plugins/artifacts/pom.xml
+++ b/plugins/artifacts/pom.xml
@@ -3,9 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-  <groupId>org.onap.ccsdk.parent</groupId>
-  <artifactId>parent</artifactId>
-  <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.plugins</groupId>
+               <artifactId>plugins-root</artifactId>
+               <version>1.2.0-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 5767bcc..2f99aa6 100644 (file)
--- a/plugins/features/ccsdk-gr-toolkit/pom.xml
+++ b/plugins/features/ccsdk-gr-toolkit/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 a1e30a9..2663228 100644 (file)
--- a/plugins/features/ccsdk-properties-node/pom.xml
+++ b/plugins/features/ccsdk-properties-node/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 6566af7..03bb475 100644 (file)
--- a/plugins/features/ccsdk-restapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-restapi-call-node/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
-               <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </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 1ebfa6d..c3d7422 100644 (file)
--- a/plugins/features/ccsdk-restconf-client/pom.xml
+++ b/plugins/features/ccsdk-restconf-client/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
-               <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </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 7533aa8..316a72b 100644 (file)
--- a/plugins/features/ccsdk-sli-plugins-all/pom.xml
+++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
-               <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </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 1ac638b..bd0f16b 100644 (file)
--- a/plugins/features/ccsdk-sshapi-call-node/pom.xml
+++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml
@@ -3,10 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </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 4deb536..45daca5 100644 (file)
--- a/plugins/features/ccsdk-template-node/pom.xml
+++ b/plugins/features/ccsdk-template-node/pom.xml
@@ -3,10 +3,9 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>single-feature-parent</artifactId>
-               <version>2.1.0</version>
-               <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.plugins</groupId>

diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml
index 848828b..a9fba19 100644 (file)
--- a/plugins/features/features-sli-plugins/pom.xml
+++ b/plugins/features/features-sli-plugins/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml
index 0ef6a10..ce5f1ed 100755 (executable)
--- a/plugins/features/installer/pom.xml
+++ b/plugins/features/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</version>
-               <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sliplugins-feature-aggregator</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.plugins</groupId>

diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml
index a7c8ffa..6e0f222 100755 (executable)
--- a/plugins/features/pom.xml
+++ b/plugins/features/pom.xml
@@ -4,8 +4,8 @@
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <artifactId>single-feature-parent</artifactId>
+               <version>2.1.1-SNAPSHOT</version>
                <relativePath/>
        </parent>
 

diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml
index b7a48e8..2dbabd9 100755 (executable)
--- a/plugins/grToolkit/installer/pom.xml
+++ b/plugins/grToolkit/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>gr-toolkit</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>

diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml
index 1b3ce68..50c75ac 100755 (executable)
--- a/plugins/grToolkit/model/pom.xml
+++ b/plugins/grToolkit/model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml
index 8e264c4..7bb5e04 100755 (executable)
--- a/plugins/grToolkit/pom.xml
+++ b/plugins/grToolkit/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</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>

diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml
index 4a3654e..3bdecd5 100755 (executable)
--- a/plugins/grToolkit/provider/pom.xml
+++ b/plugins/grToolkit/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 11027f2..79a508b 100755 (executable)
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -3,13 +3,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli</groupId>
+        <artifactId>sli-root</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
-    <artifactId>ccsdk-sli-plugins</artifactId>
+    <artifactId>plugins-root</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 a2f1a85..8ffa019 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>properties-node</artifactId>
+        <version>1.2.0-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 ae9b4d3..c0600d3 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-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 30b00f7..ea2dddd 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>properties-node</artifactId>
+        <version>1.2.0-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 51f3a3d..fa3d93a 100755 (executable)
--- 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.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.plugins</groupId>
+               <artifactId>restapi-call-node</artifactId>
+               <version>1.2.0-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 faac088..05ada5f 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-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 2e91520..86e2823 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>restapi-call-node</artifactId>
+        <version>1.2.0-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 5b9ff75..9a85acb 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>restconf-client</artifactId>
+        <version>1.2.0-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 d3f833f..3b37656 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-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 0baac7d..66d05de 100755 (executable)
--- a/plugins/restconf-client/provider/pom.xml
+++ b/plugins/restconf-client/provider/pom.xml
@@ -5,7 +5,8 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -31,6 +32,10 @@
             <groupId>org.glassfish.jersey.media</groupId>
             <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>

diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml
index a91212a..d4b613b 100755 (executable)
--- 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.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.plugins</groupId>
+               <artifactId>sshapi-call-node</artifactId>
+               <version>1.2.0-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 d55046f..e3e714d 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-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 0717bd1..d48b4a9 100755 (executable)
--- 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.parent</groupId>
-        <artifactId>binding-parent</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>sshapi-call-node</artifactId>
+        <version>1.2.0-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 d3dc569..42d295b 100644 (file)
--- 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.parent</groupId>
-               <artifactId>odlparent-lite</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.plugins</groupId>
+               <artifactId>template-node</artifactId>
+               <version>1.2.0-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 2dbbe5e..cb0f483 100644 (file)
--- 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.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
+        <groupId>org.onap.ccsdk.sli.plugins</groupId>
+        <artifactId>plugins-root</artifactId>
+        <version>1.2.0-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 883ab7c..930afef 100644 (file)
--- 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.parent</groupId>
-               <artifactId>binding-parent</artifactId>
-               <version>2.1.0</version>
+               <groupId>org.onap.ccsdk.sli.plugins</groupId>
+               <artifactId>template-node</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -43,7 +43,7 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.velocity</groupId>
-                       <artifactId>velocity</artifactId>
+                       <artifactId>velocity-engine-core</artifactId>
                </dependency>
        </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 4f335c8..29ac154 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>oparent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli</groupId>
-    <artifactId>ccsdk-sli</artifactId>
+    <artifactId>sli-root</artifactId>
     <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>