From 7f850de916f192910ce609fab96bbc1a685caec1 Mon Sep 17 00:00:00 2001
From: yufei_zhou <yufei.zhou@nokia-sbell.com>
Date: Fri, 2 Mar 2018 14:04:01 +0800
Subject: Replace mysql connector with MariaDB connector

Change-Id: I1a24a6cded69382d7a540c316f59b273a50dec02
Issue-ID: VFC-724
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
---
 .../vfcadaptorservice/vfcadaptor/pom.xml           | 22 ++++++++++++++--------
 .../src/main/resources/application.properties      |  6 ++++--
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'nokia')

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
index 08685b46..b7887a61 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/pom.xml
@@ -78,12 +78,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
- -->
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-<!-- 
+ 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -95,17 +95,23 @@
 			<scope>provided</scope>
 		</dependency>
  -->		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+ 
+     <dependency>
+        <groupId>org.mariadb.jdbc</groupId>
+        <artifactId>mariadb-java-client</artifactId>
+        <version>2.2.2</version>
+     </dependency>
+		 <dependency>
+			  <groupId>org.springframework.boot</groupId>
+			  <artifactId>spring-boot-starter-test</artifactId>
+			  <scope>test</scope>
 		</dependency>
 
-        <dependency>
+    <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
-        </dependency>
+    </dependency>
         
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
index 7ed68a98..2b870c0a 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/resources/application.properties
@@ -24,11 +24,13 @@ spring.jackson.serialization.indent_output=false
 
 #mybatis configuration
 mybatis.type-aliases-package=org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean
-spring.datasource.driverClassName = com.mysql.jdbc.Driver
+#spring.datasource.driverClassName = com.mysql.jdbc.Driver
+spring.datasource.driverClassName = org.mariadb.jdbc.Driver
 
 spring.datasource.username=vnfm
 spring.datasource.password=vnfmpass
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
+spring.datasource.url=jdbc:mariadb://127.0.0.1:3306/vnfm_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=round&useSSL=false
 
 #spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 #spring.datasource.tomcat.max-wait=30000
-- 
cgit 1.2.3-korg