POM changes to centralize test scope deps

[policy/engine.git] / PolicyEngineUtils / pom.xml

diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index c40e24a..73b6e04 100644 (file)
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP Policy Engine
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2018 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.
@@ -23,7 +23,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>PolicyEngineUtils</artifactId>
        <dependencies>
@@ -41,16 +41,6 @@
                        <groupId>org.onap.policy.common</groupId>
                        <artifactId>ONAP-Logging</artifactId>
                        <version>${project.version}</version>
-                       <exclusions>
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-module-junit4</artifactId>
-                               </exclusion>
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-core</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.eclipse.persistence</groupId>
@@ -70,7 +60,7 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.7.5</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.github.fge</groupId>
@@ -82,21 +72,20 @@
                        <artifactId>maven-model</artifactId>
                        <version>3.3.9</version>
                </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.2.3</version>
+               <!--
+               CLM security fix - force use of xstream
+               Remove this if a new version of drools-verifier is upgraded
+               that upgrades to xstream.
+                -->
+               <dependency>
+                   <groupId>com.thoughtworks.xstream</groupId>
+                   <artifactId>xstream</artifactId>
+                   <version>1.4.10</version>
                </dependency>
                <dependency>
                        <groupId>org.drools</groupId>
                        <artifactId>drools-verifier</artifactId>
-                       <version>6.3.0.Final</version>
+                       <version>6.5.0.Final</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>com.google.guava</groupId>
@@ -106,12 +95,16 @@
                                        <groupId>com.lowagie</groupId>
                                <artifactId>itext</artifactId>
                                </exclusion>
+                               <exclusion>
+                                   <groupId>com.thoughtworks.xstream</groupId>
+                                   <artifactId>xstream</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
-                       <groupId>com.att.cadi</groupId>
-                       <artifactId>cadi-aaf</artifactId>
-                       <version>1.3.0</version>
+                       <groupId>org.onap.aaf.cadi</groupId>
+                       <artifactId>cadi-aaf</artifactId>
+                       <version>1.0.0-SNAPSHOT</version>
                </dependency>
                <dependency>
                    <groupId>com.google.code.gson</groupId>
@@ -124,9 +117,9 @@
                        <version>3.1.200</version>
                </dependency>
                <dependency>
-                       <groupId>com.att.nsa</groupId>
+                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
                        <artifactId>dmaapClient</artifactId>
-                       <version>0.2.12</version>
+                       <version>${dmaap.version}</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>