From 786888f7c33d5bd147654565a5a810dfba8ad0b6 Mon Sep 17 00:00:00 2001
From: Ger Roza <rozagerardo@gmail.com>
Date: Fri, 8 Mar 2019 08:39:44 -0300
Subject: [PATCH] BAEL-12777 Upgrade parent-spring-5 version:

* Migrated parent-spring-5 version (spring-core and spring-security)
* Cleaned spring-security version being used in some modules. Now using the parent version
---
 parent-spring-5/pom.xml              |  4 ++--
 spring-mvc-simple/pom.xml            |  3 +--
 spring-security-mvc-custom/pom.xml   | 11 ++++-------
 spring-security-mvc-jsonview/pom.xml | 11 ++++-------
 spring-security-mvc-login/pom.xml    |  9 ++++-----
 spring-security-rest/pom.xml         |  7 +++----
 spring-static-resources/pom.xml      |  9 +++------
 7 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index 5d7a3b66b3..3178682d34 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -29,10 +29,10 @@
     </dependencies>
 
     <properties>
-        <spring.version>5.1.2.RELEASE</spring.version>
+        <spring.version>5.1.4.RELEASE</spring.version>
         <junit.jupiter.version>5.0.2</junit.jupiter.version>
 		<jackson.version>2.9.6</jackson.version>
-		<spring-security.version>5.1.2.RELEASE</spring-security.version>
+		<spring-security.version>5.1.4.RELEASE</spring-security.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml
index 8c2661cc27..b9ed3a3e81 100644
--- a/spring-mvc-simple/pom.xml
+++ b/spring-mvc-simple/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-oxm</artifactId>
-            <version>${spring-oxm.version}</version>
+            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
@@ -181,7 +181,6 @@
         <xstream.version>1.4.9</xstream.version>
         <scribejava.version>5.1.0</scribejava.version>
         <json.version>20180130</json.version>
-        <spring-oxm.version>5.0.2.RELEASE</spring-oxm.version>
         <apache-tiles.version>3.0.8</apache-tiles.version>
     </properties>
 
diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index b4239fb2b8..7c60a8e18a 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -21,17 +21,17 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -192,9 +192,6 @@
     </build>
 
     <properties>
-        <!-- Spring -->
-        <org.springframework.security.version>5.0.6.RELEASE</org.springframework.security.version>
-
         <!-- various -->
         <javax.servlet.version>3.1.0</javax.servlet.version>
         <jstl.version>1.2</jstl.version>
diff --git a/spring-security-mvc-jsonview/pom.xml b/spring-security-mvc-jsonview/pom.xml
index 7f1129128f..b6d3e7e399 100644
--- a/spring-security-mvc-jsonview/pom.xml
+++ b/spring-security-mvc-jsonview/pom.xml
@@ -38,17 +38,17 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -206,9 +206,6 @@
     </build>
 
     <properties>
-        <!-- Spring -->
-        <org.springframework.security.version>5.0.5.RELEASE</org.springframework.security.version>
-
         <!-- various -->
         <javax.servlet.version>3.1.0</javax.servlet.version>
         <jstl.version>1.2</jstl.version>
diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml
index bbdff6fc2f..048297bbd4 100644
--- a/spring-security-mvc-login/pom.xml
+++ b/spring-security-mvc-login/pom.xml
@@ -21,17 +21,17 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -175,7 +175,6 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.security.version>5.0.5.RELEASE</org.springframework.security.version>
 
         <!-- various -->
         <javax.servlet.version>3.1.0</javax.servlet.version>
diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index 37c743e896..24f1c5807a 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -21,12 +21,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -144,7 +144,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -274,7 +274,6 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.security.version>5.1.0.RELEASE</org.springframework.security.version>
         <org.springframework.hateoas.version>0.25.0.RELEASE</org.springframework.hateoas.version>
 
         <!-- various -->
diff --git a/spring-static-resources/pom.xml b/spring-static-resources/pom.xml
index aedf88e384..fc2b3336bc 100644
--- a/spring-static-resources/pom.xml
+++ b/spring-static-resources/pom.xml
@@ -20,17 +20,17 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-taglibs</artifactId>
-            <version>${org.springframework.security.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
@@ -196,9 +196,6 @@
     </build>
 
     <properties>
-        <!-- Spring -->
-        <org.springframework.security.version>5.0.6.RELEASE</org.springframework.security.version>
-
         <org.aspectj-version>1.8.9</org.aspectj-version>
         <javax.servlet.jsp-api.version>2.3.2-b02</javax.servlet.jsp-api.version>