From ddd8720d597fc9053a455b10445fb253adbc4bf7 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Thu, 12 Oct 2017 16:42:03 -0400 Subject: Switch to Mariadb connector. Issue: PORTAL-104 Change-Id: I71651b5dbbbe397d91168d59dfbc37d4da5778ea Signed-off-by: Christopher Lott (cl778h) --- ecomp-sdk/epsdk-app-os/README.md | 1 + .../epsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties | 4 ++-- ecomp-sdk/epsdk-core/pom.xml | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md index 3bbe0008..1ac4a142 100644 --- a/ecomp-sdk/epsdk-app-os/README.md +++ b/ecomp-sdk/epsdk-app-os/README.md @@ -20,6 +20,7 @@ Version 1.4.0, 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 d988ec21..de056a3d 100644 --- 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 0e712f75..9be09a7c 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -221,10 +221,11 @@ jackson-databind 2.6.3 + - mysql - mysql-connector-java - 5.1.22 + org.mariadb.jdbc + mariadb-java-client + 1.5.8 -- cgit 1.2.3-korg