summaryrefslogtreecommitdiffstats
path: root/epsdk-app-onap
diff options
context:
space:
mode:
authorEinat Vinouze <einat.vinouze@intl.att.com>2019-07-07 14:15:07 +0300
committerEinat Vinouze <einat.vinouze@intl.att.com>2019-07-08 13:48:31 +0300
commitd7192595536591a764afbdf159f68509b6b20bae (patch)
treebfaea56a47298f5d654acda158d7fc4e658898cf /epsdk-app-onap
parent89b0566dcf587d36f713d301b27009ce1d3bbec6 (diff)
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>
Diffstat (limited to 'epsdk-app-onap')
-rwxr-xr-xepsdk-app-onap/pom.xml8
1 files changed, 6 insertions, 2 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index f817f8db6..6bb4ffd7a 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,7 +26,11 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.4.0</epsdk.version>
<jackson.version>2.9.8</jackson.version>
- <springframework.version>4.3.22.RELEASE</springframework.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:
+ org.springframework.orm.hibernate4.HibernateTransactionManager
+ so following orm.version lets epsdk-core find it -->
+ <springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
<hibernate.version>4.3.11.Final</hibernate.version>
<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
<skipassembly>true</skipassembly>
@@ -427,7 +431,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>