From: Dan Timoney <dtimoney@att.com>
Date: Mon, 18 Sep 2017 19:43:56 +0000 (-0400)
Subject: Fix mariadb-connector-java references
X-Git-Tag: 1.0.4~9^2~333
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2935b1b029267cc6a8cc040ccd44f01994a1baa3;p=ccsdk%2Fsli.git

Fix mariadb-connector-java references

Correct mariadb JDBC connector artifactId should be mariadb-java-client,
not mariadb-connector-java

Change-Id: If58a33a1ef22d47e1d5c138bad164b0ad89219eb
Issue-ID: CCSDK-95
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/sli/features/src/main/resources/features.xml b/sli/features/src/main/resources/features.xml
index c43c90155..692d9ff0a 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:org/mariadb/jdbc/mariadb-connector-java/${mariadb.connector.version}</bundle>
+        <bundle>mvn:org/mariadb/jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
     </feature>
 
 </features>
diff --git a/sliPluginUtils/provider/pom.xml b/sliPluginUtils/provider/pom.xml
index 16940dbfe..d105036b3 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|mariadb-connector-java|slf4j-api|jcl-over-slf4j</Embed-Dependency>
+						<Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mariadb-java-client|slf4j-api|jcl-over-slf4j</Embed-Dependency>
 						<Embed-Transitive>true</Embed-Transitive>
 					</instructions>
 				</configuration>