From 2901cd97235c50b03bed3c997246b950d0f68bf8 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Wed, 7 Jul 2021 18:22:28 -0400
Subject: Synching artifacts and features-all poms

Issue-ID: CCSDK-3368
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I0876bdc0c5ee704f6194691341df313248bdcf0a
---
 adaptors/artifacts/pom.xml | 89 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 63 insertions(+), 26 deletions(-)

(limited to 'adaptors/artifacts/pom.xml')

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>
@@ -106,6 +116,26 @@
                 <artifactId>ansible-adaptor-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>
+            <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>
@@ -116,6 +146,21 @@
                 <artifactId>mdsal-resource-installer</artifactId>
                 <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>
@@ -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>
-- 
cgit 1.2.3-korg