Replace mysql connector with MariaDB connector

Change-Id: I11e7b976328ef914da41d4546f505def3f06527e
Issue-ID: VFC-725
Signed-off-by: luxin <luxin7@huawei.com>

diff --git a/ResmanagementService/service/pom.xml b/ResmanagementService/service/pom.xml
index 383e966..e6a3a3e 100644 (file)
--- a/ResmanagementService/service/pom.xml
+++ b/ResmanagementService/service/pom.xml
@@ -80,11 +80,18 @@
             <artifactId>jetty-all</artifactId>
             <version>8.1.16.v20140903</version>
         </dependency>
+        <!--
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.36</version>
         </dependency>
+        -->
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.2.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-tx</artifactId>

diff --git a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
index 95c9020..e60bf19 100644 (file)
--- a/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
+++ b/ResmanagementService/service/src/main/resources/spring/Resmanagement/services.xml
@@ -44,8 +44,8 @@
     <bean id="jsonProvider" class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" />
 
     <bean id="source"  class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
-        <property name="url" value="jdbc:mysql://127.0.0.1:3306/resmanagementdb"/>
+        <property name="driverClassName" value="org.mariadb.jdbc.Driver"/>
+        <property name="url" value="jdbc:mariadb://127.0.0.1:3306/resmanagementdb"/>
         <property name="username" value="root"/>
         <property name="password" value="rootpass"/>
     </bean>