ONAP code change for log files consolidation

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

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index dd32bf4..be3700e 100644 (file)
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ============LICENSE_START=======================================================
-  ECOMP Policy Engine
+  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,22 +24,17 @@
        <modelVersion>4.0.0</modelVersion>
        
        <parent>
-               <groupId>org.openecomp.policy.engine</groupId>
+               <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.2.0-SNAPSHOT</version>
        </parent>
        
        <artifactId>PolicyEngineAPI</artifactId>
        <dependencies>
-               <dependency>
-                       <groupId>xml-apis</groupId>
-                       <artifactId>xml-apis</artifactId>
-                       <version>1.4.01</version>
-               </dependency>                   
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.8.5</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.glassfish</groupId>
@@ -49,7 +44,7 @@
                <dependency>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.3.1</version>
+                       <version>${httpclient.version}</version>
                </dependency>
                <dependency>
                        <groupId>commons-io</groupId>
@@ -61,10 +56,16 @@
                        <artifactId>guava</artifactId>
                        <version>14.0.1</version>
                </dependency>
+               <dependency>
+               <groupId>commons-fileupload</groupId>
+               <artifactId>commons-fileupload</artifactId>
+               <version>${commons.fileupload.version}</version>
+               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
                        <version>4.11</version>
+                       <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>javax.websocket</groupId>
@@ -81,6 +82,16 @@
                        <artifactId>tyrus-container-grizzly-client</artifactId>
                        <version>1.13</version>
                </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-webmvc</artifactId>
+                       <version>4.3.3.RELEASE</version>
+               </dependency>
+               <dependency>
+                   <groupId>com.google.code.gson</groupId>
+               <artifactId>gson</artifactId>
+               <version>2.8.0</version>
+               </dependency>
                <dependency>
                        <groupId>log4j</groupId>
                        <artifactId>log4j</artifactId>
@@ -98,34 +109,21 @@
                        </exclusions>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.engine</groupId>
-                       <artifactId>ECOMP-XACML</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>javax.persistence</artifactId>
-                       <version>2.1.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>eclipselink</artifactId>
-                       <version>2.5.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>mysql</groupId>
-                       <artifactId>mysql-connector-java</artifactId>
-                       <version>5.1.30</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.mariadb.jdbc</groupId>
-                       <artifactId>mariadb-java-client</artifactId>
-                       <version>1.2.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.openecomp.policy.engine</groupId>
-                       <artifactId>PolicyEngineUtils</artifactId>
+                       <groupId>org.onap.policy.engine</groupId>
+                       <artifactId>ONAP-XACML</artifactId>
                        <version>${project.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.powermock</groupId>
+                                       <artifactId>powermock-api-mockito</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
+               <dependency>
+                   <groupId>org.mockito</groupId>
+                   <artifactId>mockito-all</artifactId>
+                   <version>1.10.19</version>
                </dependency>
        </dependencies>
        <build>