Merge "Use org.onap.aaf dependencies"

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

diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index f0e3f33..c0a6d0b 100644 (file)
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -84,7 +84,7 @@
                                        <artifactId>cambriaClient</artifactId>
                                </exclusion>
                                <exclusion>
-                                       <groupId>com.att.cadi</groupId>
+                                       <groupId>org.onap.aaf.cadi</groupId>
                                        <artifactId>cadi-aaf</artifactId>
                                </exclusion>
                        </exclusions>
@@ -144,7 +144,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>
@@ -190,7 +190,6 @@
                <dependency>
                        <groupId>com.h2database</groupId>
                        <artifactId>h2</artifactId>
-                       <version>[1.4.186,)</version>
                </dependency>
                <dependency>
                        <groupId>com.github.fge</groupId>
@@ -218,7 +217,7 @@
                        <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>
@@ -278,17 +277,17 @@
                <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>
+                       <version>${jackson.version}</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>
@@ -347,9 +346,8 @@
         </dependency>
        </dependencies>
        <properties>
-               <springframework.version>4.2.0.RELEASE</springframework.version>
+               <springframework.version>4.3.3.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>