Upgrade portal SDK to 2.4

[vid.git] / epsdk-app-onap / pom.xml

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index a3c417d..025b63a 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
                the Portal team. -->\r
        <groupId>org.onap.vid</groupId>\r
        <artifactId>epsdk-app-onap</artifactId>\r
-       <version>1.2.1-SNAPSHOT</version>\r
+       <version>3.0.0-SNAPSHOT</version>\r
        <packaging>war</packaging>\r
        <name>ECOMP SDK Webapp for OpenSource</name>\r
        <description>ECOMP SDK Web Application for public release</description>\r
@@ -17,8 +17,8 @@
                <encoding>UTF-8</encoding>\r
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
                <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <epsdk.version>1.3.2</epsdk.version>\r
-               <springframework.version>4.2.0.RELEASE</springframework.version>\r
+               <epsdk.version>2.4.0</epsdk.version>\r
+               <springframework.version>4.2.9.RELEASE</springframework.version>\r
                <hibernate.version>4.3.11.Final</hibernate.version>\r
                <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->\r
                <skipassembly>true</skipassembly>\r
@@ -28,7 +28,7 @@
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
-               <sitePath>/content/sites/site/org/openecomp/vid/${project.version}</sitePath>\r
+               <sitePath>/content/sites/site/org/onap/vid/${project.version}</sitePath>\r
 \r
                <!-- SONAR -->\r
                <sonar.language>java</sonar.language>\r
@@ -163,7 +163,7 @@
                                        </archive>\r
                                        <overlays>\r
                                                <overlay>\r
-                                                       <groupId>org.openecomp.vid</groupId>\r
+                                                       <groupId>org.onap.vid</groupId>\r
                                                        <artifactId>vid-app-common</artifactId>\r
                                                </overlay>\r
                                                <overlay>\r
@@ -272,15 +272,27 @@
                        <artifactId>epsdk-app-common</artifactId>\r
                        <version>${epsdk.version}</version>\r
                        <type>jar</type>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>war</type>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${project.version}</version>\r
                        <type>jar</type>\r
@@ -291,30 +303,52 @@
                        <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-core</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-analytics</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.onap.portal.sdk</groupId>\r
                        <artifactId>epsdk-workflow</artifactId>\r
                        <version>${epsdk.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.att.eelf</groupId>\r
                        <artifactId>eelf-core</artifactId>\r
                        <version>1.0.0</version>\r
                </dependency>\r
+               \r
+\r
+\r
+\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>war</type>\r
                </dependency>\r
                <dependency>\r
-                       <groupId>org.openecomp.vid</groupId>\r
+                       <groupId>org.onap.vid</groupId>\r
                        <artifactId>vid-app-common</artifactId>\r
                        <version>${version}</version>\r
                        <type>jar</type>\r
@@ -329,12 +363,18 @@
                <dependency>\r
                        <groupId>com.fasterxml.jackson.core</groupId>\r
                        <artifactId>jackson-core</artifactId>\r
-                       <version>2.6.3</version>\r
+                       <version>2.8.6</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.fasterxml.jackson.core</groupId>\r
                        <artifactId>jackson-databind</artifactId>\r
-                       <version>2.6.3</version>\r
+                       <version>2.6.7.1</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                                       <artifactId>jackson-core</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                </dependency>\r
                <dependency>\r
                        <groupId>com.mchange</groupId>\r
@@ -362,9 +402,6 @@
                        <artifactId>junit</artifactId>\r
                        <version>4.12</version>\r
                </dependency>\r
-               <!-- Elastic Search -->\r
-               <!-- <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> \r
-                       <version>2.2.0</version> </dependency> -->\r
                <dependency>\r
                        <groupId>org.json</groupId>\r
                        <artifactId>json</artifactId>\r
@@ -404,6 +441,11 @@
                                </exclusion>\r
                        </exclusions>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>org.springframework</groupId>\r
+                       <artifactId>spring-aop</artifactId>\r
+                       <version>${springframework.version}</version>\r
+               </dependency>\r
                <dependency>\r
                        <groupId>org.springframework</groupId>\r
                        <artifactId>spring-test</artifactId>\r