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 +++++++++++++++-------
 adaptors/features/ccsdk-sli-adaptors-all/pom.xml   | 29 +++++--
 core/artifacts/pom.xml                             | 12 ++-
 .../ccsdk-dblib/src/main/feature/feature.xml       |  1 -
 core/features/ccsdk-sli-core-all/pom.xml           | 10 +--
 northbound/artifacts/pom.xml                       |  6 +-
 northbound/dmaap-listener/pom.xml                  |  5 ++
 .../features/ccsdk-sli-northbound-all/pom.xml      |  1 -
 plugins/artifacts/pom.xml                          | 30 +++++---
 plugins/features/ccsdk-sli-plugins-all/pom.xml     |  8 +-
 10 files changed, 123 insertions(+), 68 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>
@@ -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>
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>
@@ -55,6 +52,20 @@
             <type>xml</type>
             <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>
@@ -62,16 +73,18 @@
             <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>
diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml
index 7ce528895..4721514c8 100755
--- a/core/artifacts/pom.xml
+++ b/core/artifacts/pom.xml
@@ -44,13 +44,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.core</groupId>
-                <artifactId>ccsdk-sli-core-all</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>ccsdk-sliapi</artifactId>
@@ -112,6 +105,11 @@
                 <artifactId>sli-provider-base</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.onap.ccsdk.sli.core</groupId>
+                <artifactId>sli-installer</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.core</groupId>
                 <artifactId>sliapi-model</artifactId>
diff --git a/core/features/ccsdk-dblib/src/main/feature/feature.xml b/core/features/ccsdk-dblib/src/main/feature/feature.xml
index 771c37455..acb7a7399 100644
--- a/core/features/ccsdk-dblib/src/main/feature/feature.xml
+++ b/core/features/ccsdk-dblib/src/main/feature/feature.xml
@@ -5,7 +5,6 @@
         <details>Root POM to be used in place of odlparent for CCSDK based projects</details>
         <feature prerequisite="true" dependency="false">wrap</feature>
         <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle>
-        <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
         <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
         <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&amp;overwrite=merge</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle>
diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml
index 92aac79ec..28a780edb 100644
--- a/core/features/ccsdk-sli-core-all/pom.xml
+++ b/core/features/ccsdk-sli-core-all/pom.xml
@@ -38,35 +38,35 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-slicore-utils</artifactId>
+            <artifactId>ccsdk-dblib</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-dblib</artifactId>
+            <artifactId>ccsdk-filters</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-filters</artifactId>
+            <artifactId>ccsdk-sli</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sli</artifactId>
+            <artifactId>ccsdk-sliapi</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sliapi</artifactId>
+            <artifactId>ccsdk-slicore-utils</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml
index e2b229e12..1d06144e0 100755
--- a/northbound/artifacts/pom.xml
+++ b/northbound/artifacts/pom.xml
@@ -28,21 +28,21 @@
                 <artifactId>ccsdk-asdcApi</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.northbound</groupId>
                 <artifactId>ccsdk-dataChange</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.northbound</groupId>
                 <artifactId>ccsdk-lcm</artifactId>
                 <version>${project.version}</version>
                 <type>xml</type>
-                <classifier>feature</classifier>
+                <classifier>features</classifier>
             </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.northbound</groupId>
diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml
index dc26b501e..896c15d1d 100755
--- a/northbound/dmaap-listener/pom.xml
+++ b/northbound/dmaap-listener/pom.xml
@@ -94,6 +94,11 @@
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-provider</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml
index 41da5aa9b..dc61d015f 100644
--- a/northbound/features/ccsdk-sli-northbound-all/pom.xml
+++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml
@@ -38,6 +38,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
     </dependencies>
 </project>
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