From: Ittay Stern <ittay.stern@att.com>
Date: Thu, 9 Jan 2020 15:54:41 +0000 (+0200)
Subject: Upgrade epsdk version to 2.6.0 (but keep overlay 2.5.0)
X-Git-Tag: 6.0.2~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F38%2F100138%2F1;p=vid.git

Upgrade epsdk version to 2.6.0 (but keep overlay 2.5.0)

Issue-ID: VID-471
Issue-ID: VID-718

Change-Id: Ia14fc02755e64eaf086a7799cc37c76884a60783
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f3d75e84..cc32c2ae7 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -25,7 +25,8 @@
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <epsdk.version>2.5.0</epsdk.version>
+        <epsdk.version>2.6.0</epsdk.version>
+        <epsdk.overlay.version>2.5.0</epsdk.overlay.version>
         <springframework.version>5.2.0.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:
@@ -562,7 +563,7 @@
         <dependency>
             <groupId>org.onap.portal.sdk</groupId>
             <artifactId>epsdk-app-overlay</artifactId>
-            <version>${epsdk.version}</version>
+            <version>${epsdk.overlay.version}</version>
             <type>war</type>
         </dependency>
         <dependency>
@@ -872,6 +873,11 @@
             <artifactId>commons-collections4</artifactId>
             <version>4.4</version>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.4</version>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>java-hamcrest</artifactId>