From cb6306b172873a9ad32e145775a49d01f1cd3e7e Mon Sep 17 00:00:00 2001
From: Gerardo Roza <rozagerardo@gmail.com>
Date: Fri, 9 Aug 2019 21:10:20 -0300
Subject: [PATCH] Upgraded parent-spring-5 versions, and fixed minor issues in
 modules using the parent module

---
 httpclient-simple/pom.xml                     |  4 ++--
 parent-spring-5/pom.xml                       |  7 ++++---
 spring-core-2/pom.xml                         |  4 ++--
 .../java/com/baeldung/SpringContextTest.java  | 21 -------------------
 spring-security-rest-basic-auth/pom.xml       |  4 ++--
 .../java/org/baeldung/SpringContextTest.java  | 20 ------------------
 6 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
 delete mode 100644 spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java

diff --git a/httpclient-simple/pom.xml b/httpclient-simple/pom.xml
index 7dd54c8fc4..b2b0f98dd1 100644
--- a/httpclient-simple/pom.xml
+++ b/httpclient-simple/pom.xml
@@ -21,12 +21,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml
index f85924b801..e43e129c7f 100644
--- a/parent-spring-5/pom.xml
+++ b/parent-spring-5/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
@@ -29,8 +30,8 @@
     </dependencies>
 
     <properties>
-        <spring.version>5.1.4.RELEASE</spring.version>
-		<spring-security.version>5.1.4.RELEASE</spring-security.version>
+        <spring.version>5.1.9.RELEASE</spring.version>
+        <spring-security.version>5.1.6.RELEASE</spring-security.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
index 20cd900e00..6b5547aba9 100644
--- a/spring-core-2/pom.xml
+++ b/spring-core-2/pom.xml
@@ -47,13 +47,13 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>${maven.surefire.version}</version>
             </plugin>
         </plugins>
     </build>
 
     <properties>
-        <spring.version>5.1.4.RELEASE</spring.version>
+        <maven.surefire.version>2.22.1</maven.surefire.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java b/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
deleted file mode 100644
index 9777addb61..0000000000
--- a/spring-mvc-java/src/test/java/com/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.baeldung;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.support.AnnotationConfigContextLoader;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-import com.baeldung.config.AppInitializer;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = { AppInitializer.class }, loader = AnnotationConfigContextLoader.class)
-@WebAppConfiguration
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-        
-    }
-}
diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
index 78bab83db5..143c61ae76 100644
--- a/spring-security-rest-basic-auth/pom.xml
+++ b/spring-security-rest-basic-auth/pom.xml
@@ -22,12 +22,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-config</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-security.version}</version>
         </dependency>
 
         <!-- Spring -->
diff --git a/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java b/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
deleted file mode 100644
index d984cf5c35..0000000000
--- a/spring-security-rest/src/test/java/org/baeldung/SpringContextTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.baeldung;
-
-import org.baeldung.spring.ClientWebConfig;
-import org.baeldung.spring.SecurityJavaConfig;
-import org.baeldung.spring.WebConfig;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class })
-public class SpringContextTest {
-
-    @Test
-    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
-    }
-}