summaryrefslogtreecommitdiffstats
path: root/ONAP-REST
diff options
context:
space:
mode:
authorHOCKLA <ah999m@att.com>2020-01-23 15:28:35 -0600
committerHOCKLA <ah999m@att.com>2020-02-03 09:26:27 -0600
commitce75201a88f6787c7f5aed265c32134e1a116761 (patch)
tree93feecb445debce3e6de8174d0a4fb831f22ffb9 /ONAP-REST
parent3fcc3204c1c65a5e5f774088bca1fd81dedd9ddb (diff)
policy/engine jdk11 junit and compilation error fixes
Issue-ID: POLICY-1590 Change-Id: I0bbc6f7310705c20924812efc5be2b0f91cf71a2 Signed-off-by: HOCKLA <ah999m@att.com>
Diffstat (limited to 'ONAP-REST')
-rw-r--r--ONAP-REST/pom.xml13
-rw-r--r--ONAP-REST/src/main/java/org/onap/policy/rest/util/MsModelUtils.java2
-rw-r--r--ONAP-REST/src/test/java/org/onap/policy/rest/util/MsModelUtilsTest.java2
3 files changed, 14 insertions, 3 deletions
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index 028b70c1e..e44d28703 100644
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018, 2020 AT&T Intellectual Property. All rights reserved.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -79,6 +79,11 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.9</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.3</version>
@@ -158,6 +163,12 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MsModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MsModelUtils.java
index b18572574..fad26daa4 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MsModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MsModelUtils.java
@@ -45,7 +45,7 @@ import java.util.Set;
import lombok.Getter;
import lombok.Setter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.eclipse.emf.common.util.EList;
diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/util/MsModelUtilsTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/util/MsModelUtilsTest.java
index 59115b959..6d12d57a3 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/util/MsModelUtilsTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/util/MsModelUtilsTest.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.common.logging.flexlogger.FlexLogger;