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
---
 plugins/artifacts/pom.xml                      | 30 ++++++++++++++++----------
 plugins/features/ccsdk-sli-plugins-all/pom.xml |  8 ++-----
 2 files changed, 21 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml
index 2b4a3b091..0e70d565f 100755
--- a/plugins/artifacts/pom.xml
+++ b/plugins/artifacts/pom.xml
@@ -28,39 +28,37 @@
                 <artifactId>ccsdk-properties-node</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
                 <artifactId>ccsdk-restapi-call-node</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
                 <artifactId>ccsdk-restconf-client</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>ccsdk-template-node</artifactId>
+                <artifactId>ccsdk-sshapi-call-node</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>fabric-discovery-plugin-provider</artifactId>
-                <version>${project.version}</version>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>fabric-discovery-plugin-installer</artifactId>
+                <artifactId>ccsdk-template-node</artifactId>
                 <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
             </dependency>
+
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
                 <artifactId>properties-node-provider</artifactId>
@@ -91,6 +89,16 @@
                 <artifactId>restconf-client-installer</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.plugins</groupId>
+                <artifactId>sshapi-call-node-provider</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.plugins</groupId>
+                <artifactId>sshapi-call-node-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
                 <artifactId>template-node-provider</artifactId>
diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml
index a967a3bc7..566fb10ef 100644
--- a/plugins/features/ccsdk-sli-plugins-all/pom.xml
+++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml
@@ -24,7 +24,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-restapi-call-node</artifactId>
@@ -32,7 +31,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-restconf-client</artifactId>
@@ -40,18 +38,16 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-template-node</artifactId>
+            <artifactId>ccsdk-sshapi-call-node</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sshapi-call-node</artifactId>
+            <artifactId>ccsdk-template-node</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
-- 
cgit 1.2.3-korg