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>
---
 dblib/features/src/main/resources/features.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dblib/features/src')

diff --git a/dblib/features/src/main/resources/features.xml b/dblib/features/src/main/resources/features.xml
index 5f339cba..3e41e8ee 100755
--- a/dblib/features/src/main/resources/features.xml
+++ b/dblib/features/src/main/resources/features.xml
@@ -10,9 +10,9 @@
     <feature name='sdnc-dblib' description="sdnc-dblib" version='${project.version}'>
         <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
         <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=com.mysql.*&amp;overwrite=merge</bundle>
+        <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*&amp;overwrite=merge</bundle>
         <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle>
-        <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