diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
index c0e1527a24..c1fbda0f98 100644
--- a/spring-security-mvc-session/pom.xml
+++ b/spring-security-mvc-session/pom.xml
@@ -8,10 +8,10 @@
war
- com.baeldung
- parent-spring-4
- 0.0.1-SNAPSHOT
- ../parent-spring-4
+ parent-boot-2
+ com.baeldung
+ 0.0.1-SNAPSHOT
+ ../parent-boot-2
@@ -21,17 +21,14 @@
org.springframework.security
spring-security-web
- ${org.springframework.security.version}
org.springframework.security
spring-security-config
- ${org.springframework.security.version}
org.springframework.security
spring-security-taglibs
- ${org.springframework.security.version}
@@ -39,7 +36,6 @@
org.springframework
spring-core
- ${spring.version}
commons-logging
@@ -50,43 +46,34 @@
org.springframework
spring-context
- ${spring.version}
org.springframework
spring-jdbc
- ${spring.version}
org.springframework
spring-beans
- ${spring.version}
org.springframework
spring-aop
- ${spring.version}
org.springframework
spring-tx
- ${spring.version}
org.springframework
spring-expression
- ${spring.version}
-
org.springframework
spring-web
- ${spring.version}
org.springframework
spring-webmvc
- ${spring.version}
@@ -94,14 +81,12 @@
javax.servlet
javax.servlet-api
- ${javax.servlet-api.version}
provided
javax.servlet
jstl
- ${jstl.version}
runtime
@@ -117,7 +102,6 @@
org.springframework.boot
spring-boot-starter-test
- 1.5.10.RELEASE
test
@@ -166,9 +150,6 @@
-
- 4.2.6.RELEASE
-
3.0.2
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java
index 9e9c240181..b9f50ded73 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-mvc-session/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -5,13 +5,13 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
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
-public class MvcConfig extends WebMvcConfigurerAdapter {
+public class MvcConfig implements WebMvcConfigurer {
public MvcConfig() {
super();
@@ -21,7 +21,6 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
@Override
public void addViewControllers(final ViewControllerRegistry registry) {
- super.addViewControllers(registry);
registry.addViewController("/anonymous.html");
diff --git a/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java
index deeea78e4e..b7996ebf18 100644
--- a/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-mvc-session/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -8,6 +8,8 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.security.web.session.HttpSessionEventPublisher;
@@ -24,9 +26,9 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
protected void configure(final AuthenticationManagerBuilder auth) throws Exception {
// @formatter:off
auth.inMemoryAuthentication()
- .withUser("user1").password("user1Pass").roles("USER")
+ .withUser("user1").password(passwordEncoder().encode("user1Pass")).roles("USER")
.and()
- .withUser("admin1").password("admin1Pass").roles("ADMIN");
+ .withUser("admin1").password(passwordEncoder().encode("admin1Pass")).roles("ADMIN");
// @formatter:on
}
@@ -68,5 +70,10 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter {
public HttpSessionEventPublisher httpSessionEventPublisher() {
return new HttpSessionEventPublisher();
}
+
+ @Bean
+ public PasswordEncoder passwordEncoder() {
+ return new BCryptPasswordEncoder();
+ }
}