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
---
 core/artifacts/pom.xml                                 | 12 +++++-------
 core/features/ccsdk-dblib/src/main/feature/feature.xml |  1 -
 core/features/ccsdk-sli-core-all/pom.xml               | 10 +++++-----
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'core')

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>
-- 
cgit 1.2.3-korg