From 504970756b35b5f9e5388ee32c53f83d659b4ef1 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Fri, 8 Feb 2019 13:22:06 -0500
Subject: Replace PolicyAssert with assertj

PolicyAssert has a sonar issue and is no longer needed, as the
same functionality (and more) is provided by assertj.  Modified
drools-pdp test code to replace PolicyAssert with assertj.
Updated license dates.
Removed trailing spaces.
Remove assertj version from poms, as it's now included in parent pom.

Change-Id: Ica82a959613e082dc6ed6fc9e103a198c2f17537
Issue-ID: POLICY-1393
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 policy-management/pom.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'policy-management/pom.xml')

diff --git a/policy-management/pom.xml b/policy-management/pom.xml
index 061c5b06..5d3d9eeb 100644
--- a/policy-management/pom.xml
+++ b/policy-management/pom.xml
@@ -3,14 +3,14 @@
   ============LICENSE_START=======================================================
   ONAP Policy Engine - Drools PDP
   ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2019 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.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -134,7 +134,7 @@
                         </goals>
                         <phase>process-sources</phase>
                         <configuration>
-                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
+                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
                                 with minor changes -->
                             <configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
                             <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
@@ -255,10 +255,10 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.1</version>
         </dependency>
-	
+
         <!-- if we don't explicitly specify the version here, we seem to end up
         with version 1.4 (as a dependency to drools-core). This version is
-        not compatible with 'saClientLibrary' version 1.2.1-oss 
+        not compatible with 'saClientLibrary' version 1.2.1-oss
         -->
         <dependency>
             <groupId>commons-codec</groupId>
@@ -275,7 +275,7 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
@@ -288,7 +288,7 @@
             <version>${policy.common.version}</version>
             <scope>test</scope>
         </dependency>
-	
+
         <!--
         The following dependencies are for features and drools
         applications usage
@@ -324,6 +324,12 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
-- 
cgit 1.2.3-korg