From: Amichai Hemli <amichai.hemli@intl.att.com>
Date: Sun, 2 Feb 2020 14:50:58 +0000 (+0000)
Subject: Merge "upgrade spring.framework to latest 5.2.3 to avoid CVE-2020-5398/7"
X-Git-Tag: 6.0.3~64
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e0071f0d81a88a417eacd47ef1f0c9451227e9ad;p=vid.git

Merge "upgrade spring.framework to latest 5.2.3 to avoid CVE-2020-5398/7"
---

e0071f0d81a88a417eacd47ef1f0c9451227e9ad
diff --cc epsdk-app-onap/pom.xml
index c18d8b6bf,0b9b60996..a7ce6b492
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@@ -24,11 -24,10 +24,11 @@@
          <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>
          <jackson.version>2.10.1</jackson.version>
          <jackson.databind.version>2.10.1</jackson.databind.version>
-         <springframework.version>5.2.0.RELEASE</springframework.version>
+         <springframework.version>5.2.3.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 -->