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 a817adb..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>2.1.0</epsdk.version>\r
-               <springframework.version>4.2.4.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
@@ -272,12 +272,24 @@
                        <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.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.onap.vid</groupId>\r
@@ -291,78 +303,41 @@
                        <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
-               <!--Overide versions for latest security fixes-->\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-core</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>ch.qos.logback</groupId>\r
-                       <artifactId>logback-classic</artifactId>\r
-                       <version>1.2.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-collections</groupId>\r
-                       <artifactId>commons-collections</artifactId>\r
-                       <version>3.2.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-fileupload</groupId>\r
-                       <artifactId>commons-fileupload</artifactId>\r
-                       <version>1.3.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.bouncycastle</groupId>\r
-                       <artifactId>bcprov-jdk16</artifactId>\r
-                       <version>1.46</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>xalan</groupId>\r
-                       <artifactId>xalan</artifactId>\r
-                       <version>2.7.2</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.poi</groupId>\r
-                       <artifactId>poi</artifactId>\r
-                       <version>3.15</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.thoughtworks.xstream</groupId>\r
-                       <artifactId>xstream</artifactId>\r
-                       <version>1.4.10</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient</artifactId>\r
-                       <version>4.5.3</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-core</artifactId>\r
-                       <version>2.8.6</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>xerces</groupId>\r
-                       <artifactId>xercesImpl</artifactId>\r
-                       <version>2.11.0.SP5</version>\r
-               </dependency>\r
+               \r
 \r
 \r
 \r
@@ -385,10 +360,21 @@
                        <artifactId>jackson-annotations</artifactId>\r
                        <version>2.6.3</version>\r
                </dependency>\r
+               <dependency>\r
+                       <groupId>com.fasterxml.jackson.core</groupId>\r
+                       <artifactId>jackson-core</artifactId>\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.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
@@ -416,12 +402,6 @@
                        <artifactId>junit</artifactId>\r
                        <version>4.12</version>\r
                </dependency>\r
-               <!-- Elastic Search -->\r
-               <dependency>\r
-                       <groupId>org.elasticsearch</groupId>\r
-                       <artifactId>elasticsearch</artifactId>\r
-                       <version>2.2.0</version>\r
-               </dependency>\r
                <dependency>\r
                        <groupId>org.json</groupId>\r
                        <artifactId>json</artifactId>\r