Upgrade hibernator and netty

[policy/engine.git] / ONAP-PAP-REST / pom.xml

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index f0e3f33..fc5ef93 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -21,7 +21,6 @@
 
 <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/maven-v4_0_0.xsd">
-
        <modelVersion>4.0.0</modelVersion>
        <artifactId>ONAP-PAP-REST</artifactId>
        <description>ONAP-PAP-REST</description>
@@ -29,7 +28,7 @@
        <parent>
                <groupId>org.onap.policy.engine</groupId>
                <artifactId>PolicyEngineSuite</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.2.1-SNAPSHOT</version>
        </parent>
        <build>
                <plugins>
@@ -84,7 +83,7 @@
                                        <artifactId>cambriaClient</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>com.att.cadi</groupId>
+                                       <groupId>org.onap.aaf.cadi</groupId>
                                        <artifactId>cadi-aaf</artifactId>
                                </exclusion>
                        </exclusions>
@@ -109,16 +108,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-api-mockito</artifactId>
-                               </exclusion>
-                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>javax.servlet</groupId>
@@ -144,7 +133,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.logging.log4j</groupId>
@@ -164,7 +153,7 @@
                <dependency>
                        <groupId>io.netty</groupId>
                        <artifactId>netty</artifactId>
-                       <version>3.5.0.Final</version>
+                       <version>3.9.7.Final</version>
                </dependency>
                <dependency>
                        <groupId>com.google.guava</groupId>
@@ -176,12 +165,6 @@
                        <artifactId>org.eclipse.jgit</artifactId>
                        <version>3.2.0.201312181205-r</version>
                </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
                        <artifactId>tomcat-jdbc</artifactId>
@@ -190,7 +173,6 @@
                <dependency>
                        <groupId>com.h2database</groupId>
                        <artifactId>h2</artifactId>
-                       <version>[1.4.186,)</version>
                </dependency>
                <dependency>
                        <groupId>com.github.fge</groupId>
@@ -213,20 +195,10 @@
             <version>2.1.1</version>
         </dependency>
                <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-mock</artifactId>
-                       <version>2.0.8</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
+                       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
                        <artifactId>policy-yaml</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>com.mockrunner</groupId>
-                       <artifactId>mockrunner</artifactId>
-                       <version>0.3.1</version>
-               </dependency>
                <!-- Spring -->
                <dependency>
                        <groupId>org.springframework</groupId>
@@ -267,7 +239,7 @@
                <dependency>
                        <groupId>org.hibernate</groupId>
                        <artifactId>hibernate-validator</artifactId>
-                       <version>5.1.3.Final</version>
+                       <version>5.4.2.Final</version>
                </dependency>
                <!-- https://mvnrepository.com/artifact/org.json/json -->
                <dependency>
@@ -278,17 +250,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>
@@ -308,7 +275,7 @@
                <dependency>
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
-                       <version>5.1.2</version>
+                       <version>6.2.2</version>
                </dependency>
                <dependency>
                        <groupId>io.searchbox</groupId>
@@ -332,24 +299,10 @@
                        <artifactId>tomcat-dbcp</artifactId>
                        <version>8.5.9</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>
        <properties>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
+               <springframework.version>4.3.15.RELEASE</springframework.version>
                <hibernate.version>4.3.10.Final</hibernate.version>
                <projectversion>2.0.2</projectversion>
-               <jackson.version>2.6.0</jackson.version>
        </properties>
 </project>