Upgrade hibernator and netty

[policy/engine.git] / POLICY-SDK-APP / pom.xml

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 5adb5d1..9d6a93b 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -1,10 +1,29 @@
+<!--
+  ============LICENSE_START=======================================================
+  ONAP Policy Engine
+  ================================================================================
+  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.
+  You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  ============LICENSE_END=========================================================
+  -->
 <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.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.2.1-SNAPSHOT</version>
        </parent>
        <artifactId>POLICY-SDK-APP</artifactId>
        <packaging>war</packaging>
@@ -49,19 +68,33 @@
        </build>
        <properties>
                <encoding>UTF-8</encoding>
-               <epsdk.version>1.1.0</epsdk.version>
+               <epsdk.version>2.1.0</epsdk.version>
                <springframework.version>4.2.0.RELEASE</springframework.version>
                <hibernate.version>4.3.11.Final</hibernate.version>
                <skipassembly>true</skipassembly>
                <skiptests>false</skiptests>
-               <jackson.version>2.6.0</jackson.version>
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>               
        </properties>
        <dependencies>
                <dependency>
-                       <groupId>org.openecomp.ecompsdkos</groupId>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-core</artifactId>
                        <version>${epsdk.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>mysql</groupId>
+                               <artifactId>mysql-connector-java</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>com.thoughtworks.xstream</groupId>
+                                       <artifactId>xstream</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        <!-- Spring -->
                <dependency>
@@ -109,7 +142,7 @@
                <dependency>
                        <groupId>org.hibernate</groupId>
                        <artifactId>hibernate-validator</artifactId>
-                       <version>5.1.3.Final</version>
+                       <version>5.4.2.Final</version>
                </dependency>
                <!-- Javax Mail -->
                <dependency>
@@ -121,17 +154,12 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.6.3</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.6.3</version>
+                       <version>${jackson.version}</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.module</groupId>
@@ -152,7 +180,7 @@
                <dependency>
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
-                       <version>2.2.0</version>
+                       <version>6.2.2</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -168,6 +196,10 @@
                                        <groupId>commons-logging</groupId>
                                        <artifactId>commons-logging</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.httpcomponents</groupId>
+                                       <artifactId>httpclient</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
                <dependency>
@@ -192,7 +224,7 @@
                <dependency>
                        <groupId>commons-fileupload</groupId>
                        <artifactId>commons-fileupload</artifactId>
-                       <version>1.3.1</version>
+                       <version>${commons.fileupload.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -220,12 +252,6 @@
                    <artifactId>yamlbeans</artifactId>
                    <version>1.08</version>
                </dependency>           
-               <!-- https://mvnrepository.com/artifact/org.easymock/easymock -->
-               <dependency>
-                   <groupId>org.easymock</groupId>
-                   <artifactId>easymock</artifactId>
-                   <version>3.1</version>
-               </dependency>   
                <!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
                <dependency>
                    <groupId>org.yaml</groupId>