X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=epsdk-app-onap%2Fpom.xml;h=8f63a6d0cc7ec4b70551e0475b5fd650cf76f94c;hb=e63fe3aa29fc637d57f5dbf92dda200685be790b;hp=6bb4ffd7a179838beebce22b67cbb01bf6e9b529;hpb=bca63fbeada8e1588c0798af1c83390878f18508;p=vid.git

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 6bb4ffd7a..8f63a6d0c 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
         the Portal team. -->
     <groupId>org.onap.vid</groupId>
     <artifactId>epsdk-app-onap</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>ECOMP SDK Webapp for OpenSource</name>
     <description>ECOMP SDK Web Application for public release</description>
@@ -24,9 +24,10 @@
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <epsdk.version>2.4.0</epsdk.version>
-        <jackson.version>2.9.8</jackson.version>
-        <springframework.version>5.1.6.RELEASE</springframework.version>
+        <epsdk.version>2.5.0</epsdk.version>
+        <jackson.version>2.9.9</jackson.version>
+        <jackson.databind.version>2.9.9.3</jackson.databind.version>
+        <springframework.version>5.1.9.RELEASE</springframework.version>
         <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
          org.springframework.orm.hibernate4.HibernateTransactionManager
          so following orm.version lets epsdk-core find it -->
@@ -142,6 +143,12 @@
                         <container.classpath>classpath:</container.classpath>
                     </systemPropertyVariables>
                     <useSystemClassLoader>false</useSystemClassLoader>
+                    <properties>
+                        <property>
+                            <name>usedefaultlisteners</name>
+                            <value>false</value>
+                        </property>
+                    </properties>
                 </configuration>
             </plugin>
 
@@ -149,7 +156,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -169,6 +176,10 @@
                             <groupId>org.onap.portal.sdk</groupId>
                             <artifactId>epsdk-app-overlay</artifactId>
                         </overlay>
+                        <overlay>
+                            <groupId>org.onap.vid</groupId>
+                            <artifactId>vid-webpack-master</artifactId>
+                        </overlay>
                     </overlays>
                 </configuration>
             </plugin>
@@ -206,14 +217,14 @@
                 </dependencies>
             </plugin>
             <plugin>
-              <groupId>org.sonarsource.scanner.maven</groupId>
-              <artifactId>sonar-maven-plugin</artifactId>
-              <version>3.6.0.1398</version>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.6.0.1398</version>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.3</version>
+                <version>0.8.4</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>
@@ -280,6 +291,12 @@
             <type>jar</type>
             <classifier>classes</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.onap.vid</groupId>
+            <artifactId>vid-webpack-master</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
         <!-- SDK components -->
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
@@ -321,6 +338,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.databind.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
             <version>${jackson.version}</version>
         </dependency>
         <!-- jackson-dataformat-* are to override elasticsearch-2.2.0 deps hell -->
@@ -349,7 +371,7 @@
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
-            <version>2.0.0</version>
+            <version>6.3.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -360,7 +382,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -370,12 +392,17 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20160212</version>
+            <version>20190722</version>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>3.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>2.2.1</version>
+            <version>2.3.1</version>
             <exclusions>
                 <!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
                 <exclusion>
@@ -388,7 +415,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.12</version>
+            <version>1.7.27</version>
         </dependency>
 
         <!-- springframework to override epsdk-app-common's and epsdk-core's versions -->
@@ -439,5 +466,11 @@
             <version>${springframework.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+
     </dependencies>
 </project>