Upgrade spring 4.3.15-RELEASE

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

diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index 60e603b..4739536 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.
@@ -22,20 +22,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <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.1-SNAPSHOT</version>
        </parent>
-       
        <artifactId>PolicyEngineAPI</artifactId>
        <dependencies>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.8.5</version>
-               </dependency>
                <dependency>
                        <groupId>org.glassfish</groupId>
                        <artifactId>javax.json</artifactId>
@@ -44,7 +37,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>
@@ -59,13 +52,7 @@
                <dependency>
                <groupId>commons-fileupload</groupId>
                <artifactId>commons-fileupload</artifactId>
-               <version>1.3.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
+               <version>${commons.fileupload.version}</version>
                </dependency>
                <dependency>
                        <groupId>javax.websocket</groupId>
@@ -85,7 +72,7 @@
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>spring-webmvc</artifactId>
-                       <version>4.3.3.RELEASE</version>
+                       <version>4.3.15.RELEASE</version>
                </dependency>
                <dependency>
                    <groupId>com.google.code.gson</groupId>
@@ -109,25 +96,9 @@
                        </exclusions>
                </dependency>
                <dependency>
-                       <groupId>org.openecomp.policy.engine</groupId>
-                       <artifactId>ECOMP-XACML</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>
-                               <exclusion>
-                                       <groupId>com.att.aft</groupId>
-                               <artifactId>dme2</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>