From 3bbd23f6209d8db5b2938eb8fcb79a6823fa21ac Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Tue, 26 Mar 2019 11:25:37 +0200
Subject: [PATCH] Upgrade springframework to 4.3.22 (was 4.2.x)

Issue-ID: VID-435

Change-Id: Ib7722368894fb39119d47602bca5c4453430ab8e
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 epsdk-app-onap/pom.xml             | 30 +++++++++++++++++++-----------
 vid-app-common/pom.xml             | 25 +++++++++++++++++++------
 vid-automation/pom.xml             |  2 +-
 vid-ext-services-simulator/pom.xml |  2 +-
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 00b421e88..8d4d209d1 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,7 +26,7 @@
         <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.2.9.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
         <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
         <skipassembly>true</skipassembly>
@@ -398,11 +398,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
+
+        <!-- springframework to override epsdk-app-common's and epsdk-core's versions -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -414,11 +411,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -439,5 +431,21 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${springframework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 8482ae627..205d6422a 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -26,7 +26,7 @@
         <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.2.9.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
         <jackson.version>2.9.8</jackson.version>
         <jersey.version>2.27</jersey.version>
@@ -628,11 +628,8 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.12</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-            <version>${springframework.version}</version>
-        </dependency>
+
+        <!-- springframework to override epsdk-app-common's and epsdk-core's versions -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
@@ -664,6 +661,22 @@
             <artifactId>spring-webmvc</artifactId>
             <version>${springframework.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <version>${springframework.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml
index 21c8c6462..fb51a4a31 100644
--- a/vid-automation/pom.xml
+++ b/vid-automation/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>automationTest</artifactId>
     <version>1.0-SNAPSHOT</version>
     <properties>
-        <springframework.version>4.2.9.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <jersey.version>2.27</jersey.version>
         <jackson.version>2.9.7</jackson.version>
         <aspectj.version>1.8.10</aspectj.version>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index 8efb9488d..8596b973c 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -13,7 +13,7 @@
     <properties>
         <encoding>UTF-8</encoding>
         <epsdk.version>1.3.0</epsdk.version>
-        <springframework.version>4.3.4.RELEASE</springframework.version>
+        <springframework.version>4.3.22.RELEASE</springframework.version>
         <hibernate.version>5.3.4.Final</hibernate.version>
         <!-- Skip assembling the zip by default -->
         <skipassembly>true</skipassembly>
-- 
2.16.6