From 06d41227e6e745cf9dfbe8df2b29fd67992060da Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 18 Sep 2018 19:22:30 -0400
Subject: [PATCH] Fixes for oparent upgrade

Clean up mariadb so that it is consistent, allow jetty to be
defined by oparent, and fixes to fully support google guava
upgrade.

Issue-ID: POLICY-1126
Change-Id: Ic0c2fba5f6f5f1a41e53770b95861606a5b4bbe6
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 LogParser/pom.xml                                                       | 1 -
 ONAP-PAP-REST/pom.xml                                                   | 1 -
 ONAP-PDP-REST/pom.xml                                                   | 1 -
 .../main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java    | 2 +-
 ONAP-SDK-APP/pom.xml                                                    | 1 -
 PolicyEngineUtils/pom.xml                                               | 1 -
 PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java  | 2 +-
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/LogParser/pom.xml b/LogParser/pom.xml
index 77cd2c90b..5d5f797d6 100644
--- a/LogParser/pom.xml
+++ b/LogParser/pom.xml
@@ -37,7 +37,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 8abc40013..3eb94adb5 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -189,7 +189,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 1aed0700c..04483a16e 100644
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -79,7 +79,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>postgresql</groupId>
diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java
index 197db26c1..47b6efb2a 100644
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/utils/PolicyApiUtils.java
@@ -48,7 +48,7 @@ public class PolicyApiUtils {
             LOGGER.error("The Value is empty.");
             return false;
         } else {
-            if (CharMatcher.ASCII.matchesAllOf((CharSequence) jsonString)) {
+            if (CharMatcher.ascii().matchesAllOf((CharSequence) jsonString)) {
                 LOGGER.info("The Value does not contain ASCII Characters");
                 isValidForm = true;
             } else {
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index 9e845b964..d2281afd1 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -298,7 +298,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>1.2.3</version>
         </dependency>
         <dependency>
             <groupId>commons-dbcp</groupId>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index 052d63785..e2fc598cd 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.fge</groupId>
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 06263853e..67210c814 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyUtils.java
@@ -196,7 +196,7 @@ public class PolicyUtils {
      * @return
      */
     public static boolean containsNonAsciiEmptyChars(String value) {
-        return (value == null|| value.contains(" ") || "".equals(value.trim())|| !CharMatcher.ASCII.matchesAllOf((CharSequence) value))? true:false;
+        return (value == null || value.contains(" ") || "".equals(value.trim()) || !CharMatcher.ascii().matchesAllOf((CharSequence) value)) ? true : false;
     }
     
     /**
-- 
2.16.6