From d7192595536591a764afbdf159f68509b6b20bae Mon Sep 17 00:00:00 2001
From: Einat Vinouze <einat.vinouze@intl.att.com>
Date: Sun, 7 Jul 2019 14:15:07 +0300
Subject: Upgrade to Spring 5.1.6 + simulator fasterxml

Issue-ID: VID-512
Change-Id: I9a74e6357671c5eee0a425354dcd07c762c69c83
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
---
 vid-app-common/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'vid-app-common/pom.xml')

diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 6a48190bd..10fb3da62 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -26,7 +26,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <epsdk.version>2.4.0</epsdk.version>
-        <springframework.version>4.3.22.RELEASE</springframework.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:
+         org.springframework.orm.hibernate4.HibernateTransactionManager
+         so following orm.version lets epsdk-core find it -->
         <hibernate.version>4.3.11.Final</hibernate.version>
         <jackson.version>2.9.8</jackson.version>
         <jersey.version>2.27</jersey.version>
@@ -704,7 +708,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-orm</artifactId>
-            <version>${springframework.version}</version>
+            <version>${springframework.orm.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
-- 
cgit 1.2.3-korg