From 2c60d26db70ffce626ba391a27ec8f5152d0557b Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Mon, 18 Sep 2017 14:56:39 -0400
Subject: Update sli/core to use Mariadb connectori

Update sli/core (including dblib, notably) to use mariadb-connector
for any jUnit tests.  Update Import-Package in dblib provider pom.xml
to import org.mariadb.jdbc so that org.mariadb.jdbc.Driver will
be resolved

Change-Id: I39dfe2cafb955ba1bf05b0ecdb0212d766fcc96c
Issue-ID: CCSDK-95
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 sli/common/pom.xml                           | 6 +++---
 sli/features/src/main/resources/features.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'sli')

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index c367dd77..e6bac8ad 100755
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -84,9 +84,9 @@
             <version>${equinox.osgi.version}</version>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.connector.version}</version>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>${mariadb.connector.version}</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
diff --git a/sli/features/src/main/resources/features.xml b/sli/features/src/main/resources/features.xml
index fef11331..c43c9015 100644
--- a/sli/features/src/main/resources/features.xml
+++ b/sli/features/src/main/resources/features.xml
@@ -33,7 +33,7 @@
         <bundle>mvn:org.onap.ccsdk.sli.core/sli-provider/${project.version}</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.core/sli-recording/${project.version}</bundle>
         <feature>sdnc-dblib</feature>
-        <bundle>mvn:mysql/mysql-connector-java/${mysql.connector.version}</bundle>
+        <bundle>mvn:org/mariadb/jdbc/mariadb-connector-java/${mariadb.connector.version}</bundle>
     </feature>
 
 </features>
-- 
cgit 1.2.3-korg