summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xdblib/features/src/main/resources/features.xml4
-rwxr-xr-xdblib/provider/pom.xml7
-rwxr-xr-xfilters/provider/pom.xml8
-rwxr-xr-xsli/common/pom.xml6
-rw-r--r--sli/features/src/main/resources/features.xml2
-rwxr-xr-xsliPluginUtils/provider/pom.xml2
6 files changed, 14 insertions, 15 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>
diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index a59071937..e6d91c903 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -54,13 +54,7 @@
<artifactId>sli-common</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
--->
+
</dependencies>
<build>
diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index c367dd779..e6bac8ada 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 fef113317..c43c90155 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>
diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index ad950c0c8..16940dbfe 100755
--- a/sliPluginUtils/provider/pom.xml
+++ b/sliPluginUtils/provider/pom.xml
@@ -72,7 +72,7 @@
<Bundle-SymbolicName>org.onap.ccsdk.sli.core.slipluginutils</Bundle-SymbolicName>
<Export-Package>org.onap.ccsdk.sli.core.slipluginutils</Export-Package>
<Import-Package>org.onap.ccsdk.sli.core.*,org.osgi.framework.*,org.slf4j.*,java.net.*</Import-Package>
- <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mysql-connector-java|slf4j-api|jcl-over-slf4j</Embed-Dependency>
+ <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mariadb-connector-java|slf4j-api|jcl-over-slf4j</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>