From 23a8ac3cc014e4ba14fb4829fc876ead63b3bdbb Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sun, 17 Jun 2018 10:03:56 +0300
Subject: [PATCH] update to spring 5

---
 spring-security-mvc-custom/pom.xml                   | 12 ++++++------
 .../src/main/java/org/baeldung/spring/MvcConfig.java |  6 ++----
 .../java/org/baeldung/spring/SecSecurityConfig.java  |  2 ++
 .../org/baeldung/web/controller/LoginController.java |  3 ++-
 .../src/main/resources/webSecurityConfig.xml         | 10 +++++-----
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index 52ec1e4ef0..e50304aa1b 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -9,9 +9,9 @@
 
 	<parent>
 		<groupId>com.baeldung</groupId>
-		<artifactId>parent-spring-4</artifactId>
+		<artifactId>parent-spring-5</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../parent-spring-4</relativePath>
+		<relativePath>../parent-spring-5</relativePath>
 	</parent>
 
 	<dependencies>
@@ -193,26 +193,26 @@
 
 	<properties>
 		<!-- Spring -->
-		<org.springframework.security.version>4.2.6.RELEASE</org.springframework.security.version>
+		<org.springframework.security.version>5.0.6.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
 		<hibernate.version>5.2.5.Final</hibernate.version>
 		<mysql-connector-java.version>5.1.40</mysql-connector-java.version>
 
 		<!-- various -->
-		<hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
+		<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
 		<javax.servlet.version>3.1.0</javax.servlet.version>
 		<jstl.version>1.2</jstl.version>
 
 		<!-- util -->
 		<guava.version>19.0</guava.version>
 		<commons-lang3.version>3.5</commons-lang3.version>
-		<jackson-databind.version>2.9.1</jackson-databind.version>
+		<jackson-databind.version>2.9.4</jackson-databind.version>
 
 		<httpclient.version>4.5.2</httpclient.version>
 		<httpcore.version>4.4.5</httpcore.version>
 
-		<rest-assured.version>2.9.0</rest-assured.version>
+		<rest-assured.version>3.0.7</rest-assured.version>
 
 		<!-- Maven plugins -->
 		<maven-war-plugin.version>2.6</maven-war-plugin.version>
diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java
index 3b97afc22d..db6141d43e 100644
--- a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -10,14 +10,14 @@ import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 import org.springframework.web.servlet.view.JstlView;
 
 @EnableWebMvc
 @Configuration
 @ComponentScan("org.baeldung.web.controller")
-public class MvcConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig implements WebMvcConfigurer {
 
     public MvcConfig() {
         super();
@@ -27,8 +27,6 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
 
     @Override
     public void addViewControllers(final ViewControllerRegistry registry) {
-        super.addViewControllers(registry);
-
         registry.addViewController("/anonymous.html");
 
         registry.addViewController("/login.html");
diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
index 4da114c78b..e9d5bc4f70 100644
--- a/spring-security-mvc-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-mvc-custom/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -6,6 +6,8 @@ import org.springframework.context.annotation.ImportResource;
 @Configuration
 @ImportResource({ "classpath:webSecurityConfig.xml" })
 public class SecSecurityConfig {
+    
+    
 
     public SecSecurityConfig() {
         super();
diff --git a/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/LoginController.java b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/LoginController.java
index c67a6f667e..99bf345a41 100644
--- a/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/LoginController.java
+++ b/spring-security-mvc-custom/src/main/java/org/baeldung/web/controller/LoginController.java
@@ -1,5 +1,6 @@
 package org.baeldung.web.controller;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
@@ -18,7 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @RequestMapping(value = "/custom")
 public class LoginController {
 
-    @Autowired
+    @Resource(name="authenticationManager")
     private AuthenticationManager authManager;
 
     public LoginController() {
diff --git a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml
index f2ecaba5c8..e79e14abeb 100644
--- a/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml
+++ b/spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml
@@ -2,9 +2,9 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security 
-        http://www.springframework.org/schema/security/spring-security-4.2.xsd
+        http://www.springframework.org/schema/security/spring-security.xsd
 		http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"
+        http://www.springframework.org/schema/beans/spring-beans.xsd"
 >
 
     <http use-expressions="true">
@@ -24,11 +24,11 @@
 
     <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
 
-    <authentication-manager>
+    <authentication-manager id="authenticationManager">
         <authentication-provider>
             <user-service>
-                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
-                <user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
+                <user name="user1" password="{noop}user1Pass" authorities="ROLE_USER" />
+                <user name="admin1" password="{noop}admin1Pass" authorities="ROLE_ADMIN"/>
             </user-service>
         </authentication-provider>
     </authentication-manager>