Synching artifacts and features-all poms

Issue-ID: CCSDK-3368
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0876bdc0c5ee704f6194691341df313248bdcf0a

2 files changed, 84 insertions, 34 deletions

diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml
index 80b9b971b..5bbd27aa5 100755
--- a/adaptors/artifacts/pom.xml
+++ b/adaptors/artifacts/pom.xml
@@ -28,64 +28,74 @@
                 <artifactId>ccsdk-aai-service</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>ccsdk-ansible-adaptor</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>ccsdk-base-http</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>ccsdk-chef-adaptor</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>ccsdk-mdsal-resource</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
-                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ccsdk-netbox-client</artifactId>
+                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+                <artifactId>ccsdk-messagerouter-publisher</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ccsdk-resource-management</artifactId>
+                <artifactId>ccsdk-netbox-client</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ccsdk-saltstack-adaptor</artifactId>
+                <artifactId>ccsdk-resource-assignment</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
+            <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ccsdk-sql-resource</artifactId>
+                <artifactId>ccsdk-saltstack-adaptor</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
+            -->
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ccsdk-base-http</artifactId>
+                <artifactId>ccsdk-sql-resource</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
+
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>aai-service-provider</artifactId>
@@ -98,7 +108,7 @@
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>ansible-adaptor-provider</artifactId>
+                <artifactId>ansible-adaptor-bundle</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -108,6 +118,26 @@
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>base-http-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>base-http-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>chef-adaptor-bundle</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+                <artifactId>chef-adaptor-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>mdsal-resource-provider</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -117,6 +147,21 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+                <artifactId>publisher.api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+                <artifactId>publisher.provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
+                <artifactId>publisher.installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>netbox-client-provider</artifactId>
                 <version>${project.version}</version>
@@ -136,6 +181,7 @@
                 <artifactId>resource-assignment-installer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>saltstack-adaptor-provider</artifactId>
@@ -146,6 +192,7 @@
                 <artifactId>saltstack-adaptor-installer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            -->
             <dependency>
                 <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                 <artifactId>sql-resource-provider</artifactId>
@@ -156,16 +203,6 @@
                 <artifactId>sql-resource-installer</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>base-http-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-                <artifactId>base-http-installer</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
index e23f8cb48..2124a0300 100644
--- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
+++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml
@@ -31,19 +31,16 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-saltstack-adaptor</artifactId>
+            <artifactId>ccsdk-base-http</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-netbox-client</artifactId>
+            <artifactId>ccsdk-chef-adaptor</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
@@ -56,22 +53,38 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
+            <groupId>${project.groupId}.messagerouter</groupId>
+            <artifactId>ccsdk-messagerouter-publisher</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-netbox-client</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-resource-assignment</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <!-- saltstack-adaptor needs to be changed to remove dependency on app-c code
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sql-resource</artifactId>
+            <artifactId>ccsdk-saltstack-adaptor</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <dependency>
-            <groupId>${project.groupId}.messagerouter</groupId>
-            <artifactId>ccsdk-messagerouter-publisher</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-sql-resource</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>