From 98ab70838379e3e00a5596fdb32de81a814e2247 Mon Sep 17 00:00:00 2001
From: "Tej, Tarun" <tt3868@att.com>
Date: Tue, 19 Sep 2017 23:14:33 -0400
Subject: mysql connector to mariadb changes

changes to mysql connector to mariadb connector along with additional
Junits

Issue-Id: POLICY-219
Change-Id: I26ee1cf733d49d10fccbcd159fe8fc380120efbf
Signed-off-by: Tej, Tarun <tt3868@att.com>
---
 PolicyEngineUtils/pom.xml                                     | 11 ++++++++---
 .../src/main/java/org/onap/policy/utils/PolicyUtils.java      |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'PolicyEngineUtils')

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index c0837055f..effaf5b9d 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -63,9 +63,9 @@
 			<version>2.6.0</version>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.30</version>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.1.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -109,6 +109,11 @@
 			<artifactId>cadi-aaf</artifactId>
 			<version>1.3.0</version>
 		</dependency>
+		<dependency>
+		    <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.1</version>
+        </dependency>
 		<dependency>
 			<groupId>com.att.aft</groupId>
 			<artifactId>dme2</artifactId>
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
index b74bd28cc..51409b6f7 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
@@ -45,11 +45,11 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
-import com.att.aft.dme2.internal.gson.JsonParser;
-import com.att.aft.dme2.internal.gson.JsonSyntaxException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.CharMatcher;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
 
 public class PolicyUtils {
     private static final Logger LOGGER = FlexLogger.getLogger(PolicyUtils.class);
-- 
cgit 1.2.3-korg