Merge "ONAP code change for log files consolidation"

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

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 2183a87..76cbc1b 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/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.
@@ -24,11 +24,16 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.1-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        <artifactId>BRMSGateway</artifactId>
        <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>PolicyEngineAPI</artifactId>
@@ -49,27 +54,43 @@
                <dependency>
                        <groupId>org.apache.maven</groupId>
                        <artifactId>maven-model</artifactId>
-                       <version>2.2.1</version>
+                       <version>3.3.9</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.maven.shared</groupId>
                        <artifactId>maven-invoker</artifactId>
-                       <version>2.2</version>
+                       <version>3.0.0</version>
                </dependency>
                <dependency>
                        <groupId>org.onap.policy.common</groupId>
                        <artifactId>integrity-monitor</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <!--
+               CLM security fix - force use of commons-collections 3.2.2.
+               Remove this if a new version of nexus-rest-client-java is upgraded
+               to not use velocity (and then subsequently commons-collections v3.1 
+                -->
+               <dependency>
+                   <groupId>commons-collections</groupId>
+                   <artifactId>commons-collections</artifactId>
+                   <version>3.2.2</version>
+               </dependency>
                <dependency>
                        <groupId>org.sonatype.nexus</groupId>
                        <artifactId>nexus-rest-client-java</artifactId>
-                       <version>2.3.1</version>
+                       <version>2.3.1-01</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>commons-collections</groupId>
+                                       <artifactId>commons-collections</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>com.thoughtworks.xstream</groupId>
                        <artifactId>xstream</artifactId>
-                       <version>1.3.1</version>
+                       <version>1.4.10</version>
                </dependency>
                <dependency>
                        <groupId>com.att.nsa</groupId>
@@ -83,9 +104,9 @@
                        </exclusions>
                </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>
@@ -100,8 +121,21 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.5.2</version>
+                       <version>${httpclient.version}</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+               <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-api-mockito</artifactId>
+               <version>1.7.3</version>
+               <scope>test</scope>
                </dependency>
+               <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.7.3</version>
+            <scope>test</scope>
+        </dependency>
        </dependencies>
        <build>
                <plugins>