use epsdk 2.5.0 in VID

Issue-ID: VID-378
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: Id483174b283a5f1eb6160982a446ccb223606c9e

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 61d2495..e6f8b37 100755 (executable)
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -24,7 +24,7 @@
         <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>
+        <epsdk.version>2.5.0</epsdk.version>
         <jackson.version>2.9.8</jackson.version>
         <springframework.version>5.1.6.RELEASE</springframework.version>
         <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f69ff1..a1cd41d 100755 (executable)
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -25,7 +25,7 @@
         <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>
+        <epsdk.version>2.5.0</epsdk.version>
         <springframework.version>5.1.6.RELEASE</springframework.version>
         <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
         <!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
@@ -838,6 +838,11 @@
             <artifactId>commons-proxy</artifactId>
             <version>1.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>

diff --git a/vid-app-common/src/main/webapp/WEB-INF/web.xml b/vid-app-common/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755 (executable)
index 7f0a40e..0000000
--- a/vid-app-common/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee" \r
-         xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"\r
-         version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">\r
-\r
-       <display-name>vid-common</display-name>\r
-\r
-       <!-- The app can function on a HA cluster -->\r
-       <distributable />\r
-\r
-       <session-config>\r
-               <session-timeout>7</session-timeout>\r
-               <tracking-mode>COOKIE</tracking-mode>\r
-       </session-config>\r
-\r
-</web-app>\r

diff --git a/vid-app-common/src/test/resources/WEB-INF/web.xml b/vid-app-common/src/test/resources/WEB-INF/web.xml
deleted file mode 100644 (file)
index 273544d..0000000
--- a/vid-app-common/src/test/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5">
-       
-  <display-name>ecomp-sdk-app-att</display-name>
-  <distributable/>
-  <session-config>
-    <session-timeout>7</session-timeout>
-    <tracking-mode>COOKIE</tracking-mode>
-  </session-config>
-</web-app>
\ No newline at end of file