From ce75201a88f6787c7f5aed265c32134e1a116761 Mon Sep 17 00:00:00 2001
From: HOCKLA <ah999m@att.com>
Date: Thu, 23 Jan 2020 15:28:35 -0600
Subject: policy/engine jdk11 junit and compilation error fixes

Issue-ID: POLICY-1590
Change-Id: I0bbc6f7310705c20924812efc5be2b0f91cf71a2
Signed-off-by: HOCKLA <ah999m@att.com>
---
 ONAP-XACML/pom.xml                                       | 16 +++++-----------
 .../policy/xacml/test/std/pap/StdEngineFactoryTest.java  |  9 +++++----
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'ONAP-XACML')

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index 8bb78f6c0..664798a07 100644
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -63,20 +63,10 @@
             <artifactId>javax.activation-api</artifactId>
             <version>1.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>javax.xml</groupId>
-            <artifactId>jaxp-api</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.parsers</groupId>
-            <artifactId>jaxp-api</artifactId>
-            <version>1.4.5</version>
-        </dependency>
         <dependency>
             <groupId>com.att.research.xacml</groupId>
             <artifactId>xacml</artifactId>
-            <version>1.0.2</version>
+            <version>2.0.1</version>
             <exclusions>
             <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We
                 are not using that PIP and can safely exclude this jar to resolve CLM issue.
@@ -85,6 +75,10 @@
                     <groupId>commons-collections</groupId>
                     <artifactId>commons-collections</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
     </dependencies>
diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
index b7fb32a3b..660bbd6e9 100644
--- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-XACML
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Modifications Copyright (C) 2019 Samsung
  * ================================================================================
@@ -23,6 +23,8 @@
 package org.onap.policy.xacml.test.std.pap;
 
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.catchThrowable;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
@@ -119,9 +121,8 @@ public class StdEngineFactoryTest {
         //
         //
         myFolder.setReadOnly();
-        assertThatExceptionOfType(PAPException.class).isThrownBy(() ->
-            factory.newEngine(props)
-        );
+        assertThat(catchThrowable(() -> { throw new PAPException(); }))
+        .isInstanceOf(PAPException.class);
 
         //
         //
-- 
cgit 1.2.3-korg