summaryrefslogtreecommitdiffstats
path: root/dblib
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-18 14:56:39 -0400
committerDan Timoney <dtimoney@att.com>2017-09-18 14:56:39 -0400
commit2c60d26db70ffce626ba391a27ec8f5152d0557b (patch)
tree1a17cc6ebf954047db3618b99e8b9ac173a647e9 /dblib
parentc0ed8c172e444ae530e0bb9c63b6e4fafff6caa1 (diff)
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>
Diffstat (limited to 'dblib')
-rwxr-xr-xdblib/features/src/main/resources/features.xml4
-rwxr-xr-xdblib/provider/pom.xml7
2 files changed, 8 insertions, 3 deletions
diff --git a/dblib/features/src/main/resources/features.xml b/dblib/features/src/main/resources/features.xml
index 5f339cba0..3e41e8eeb 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>
diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 01d7f97d3..765f73798 100755
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -47,6 +47,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>${mariadb.connector.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
@@ -76,7 +81,7 @@
<instructions>
<Bundle-SymbolicName>org.onap.ccsdk.sli.core.dblib</Bundle-SymbolicName>
<Export-Package>org.onap.ccsdk.sli.core.dblib;version=${project.version}</Export-Package>
- <Import-Package>*,com.mysql.jdbc</Import-Package>
+ <Import-Package>*,org.mariadb.jdbc</Import-Package>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>