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>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<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>
</dependency>
<dependency>
<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.1.1</version>
</dependency>
<dependency>
<groupId>postgresql</groupId>
</dependency>
<dependency>
<groupId>postgresql</groupId>
LOGGER.error("The Value is empty.");
return false;
} else {
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 {
LOGGER.info("The Value does not contain ASCII Characters");
isValidForm = true;
} else {
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>1.2.3</version>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
- <version>2.1.1</version>
</dependency>
<dependency>
<groupId>com.github.fge</groupId>
</dependency>
<dependency>
<groupId>com.github.fge</groupId>
* @return
*/
public static boolean containsNonAsciiEmptyChars(String value) {
* @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;