From f7222f85e8c472e0d434d96191930dc989452e87 Mon Sep 17 00:00:00 2001
From: jhh <jorge.hernandez-herrero@att.com>
Date: Thu, 31 Oct 2019 11:36:17 -0500
Subject: upgrade to 7.28.0.Final drools libraries

commons-lang does not seem to be packaged anymore
(commons-lang3 still does, which is the desired one).

There are some @SupressWarning that seem to have no effect
that were removed.

Some libraries that were explicitly added are transitively
used now in the latest version of drools, hence some rework
in the dependency and exclude sections.   We will need to
generate a clm report to verify.

Issue-ID: POLICY-1407
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I44e09183caca72f5f33bdec0b8fa88b0b4793055
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 policy-core/pom.xml | 73 +++++++++++++++--------------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

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

diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 7497a34c..25b099c0 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -30,129 +30,96 @@
         <version>1.6.0-SNAPSHOT</version>
     </parent>
 
-    <properties>
-        <protobuf.version>3.6.1</protobuf.version>
-    </properties>
-
     <dependencies>
-    <!--
-    Issue: 1 of 2
-    These 3 dependencies are trying to upgrade security fixes
-    identified. If they are removed or manipulated then please
-    fix the 2nd change as noted below. 
-    -->
+
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.0.24</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-api</artifactId>
-            <version>6.5.0.Final</version>
         </dependency>
+
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-ci</artifactId>
-            <version>6.5.0.Final</version>
-      <!--
-      Issue: 2 of 2
-      Excluding these 2 dependencies in order to force upgrade security fixes
-      identified. As declared above. Any changes here should be reflected above
-      and vice versa.
-      -->
+            <!--
+            Issue: 2 of 2
+            Excluding these 2 dependencies in order to force upgrade security fixes
+            identified. As declared above. Any changes here should be reflected above
+            and vice versa.
+            -->
             <exclusions>
                 <exclusion>
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-utils</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.thoughtworks.xstream</groupId>
-                    <artifactId>xstream</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
-            <version>6.5.0.Final</version>
         </dependency>
+
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-persistence-jpa</artifactId>
-            <version>6.5.0.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>capabilities</artifactId>
             <version>${policy.common.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>utils</artifactId>
             <version>${policy.common.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.onap.policy.drools-pdp</groupId>
             <artifactId>policy-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>utils-test</artifactId>
             <version>${policy.common.version}</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
-- 
cgit 1.2.3-korg