diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-08-12 05:45:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-08-12 05:45:56 +0000 |
| commit | b3272c142193cd37f5dae7807e713819885d102d (patch) | |
| tree | 5a2f8bade23e6c7a2925dbccf5d4124d1744ad50 | |
| parent | ad706d09442b1b1b6d2d8cff4042867ceea6b56f (diff) | |
| parent | d36ae5efa43d7567188b3b91994157288b934fb4 (diff) | |
Merge "use epsdk 2.5.0 in VID"
| -rwxr-xr-x | epsdk-app-onap/pom.xml | 2 | ||||
| -rwxr-xr-x | vid-app-common/pom.xml | 7 | ||||
| -rwxr-xr-x | vid-app-common/src/main/webapp/WEB-INF/web.xml | 17 | ||||
| -rw-r--r-- | vid-app-common/src/test/resources/WEB-INF/web.xml | 11 |
4 files changed, 7 insertions, 30 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml index 61d249549..e6f8b3767 100755 --- 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 5f69ff162..a1cd41dfd 100755 --- 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: @@ -839,6 +839,11 @@ <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> <version>2.0.0.0</version> 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 index 7f0a40ef2..000000000 --- a/vid-app-common/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
-
- <display-name>vid-common</display-name>
-
- <!-- The app can function on a HA cluster -->
- <distributable />
-
- <session-config>
- <session-timeout>7</session-timeout>
- <tracking-mode>COOKIE</tracking-mode>
- </session-config>
-
-</web-app>
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 index 273544d6f..000000000 --- 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 |