Switch to Mariadb connector.

Issue: PORTAL-104
Change-Id: I71651b5dbbbe397d91168d59dfbc37d4da5778ea
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 3bbe000..1ac4a14 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -20,6 +20,7 @@ Version 1.4.0, <?day> <?month> 2017
 - PORTAL-79 remove unwanted SDK left menu under Report-sample dashboard
 - PORTAL-90 Use approved ONAP license text
 - Portal-86 Remove application specific usages from tests and other files (rework)
+- Portal-104 Replaced the sql connector to maria db
 
 * Put new entries here *
 

diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties
index d988ec2..de056a3 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties
@@ -25,8 +25,8 @@ decryption_key                                  = AGLDdG4D04BKm2IxIWEr8o==
 
        
 #Mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://localhost:3306/ecomp_sdk_os
+db.driver =  org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb://localhost:3306/ecomp_sdk
 db.userName = userName
 db.password = password
 db.encrypt_flag = false

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 0e712f7..9be09a7 100644 (file)
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -221,10 +221,11 @@
                        <artifactId>jackson-databind</artifactId>
                        <version>2.6.3</version>
                </dependency>
+               <!-- Use Mariadb connector -->
                <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>5.1.22</version>
+                       <groupId>org.mariadb.jdbc</groupId>
+                       <artifactId>mariadb-java-client</artifactId>
+                       <version>1.5.8</version>
                </dependency>
 
                <dependency>