From 625ae336815891649f53210e8fc0a72284aea9bc Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Sat, 9 Jun 2018 10:36:09 +0300
Subject: [PATCH] upgrade to boot 2

---
 spring-security-thymeleaf/pom.xml                     |  4 ++--
 .../SecurityConfiguration.java                        | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-security-thymeleaf/pom.xml b/spring-security-thymeleaf/pom.xml
index aa36e5f59a..28d6126b55 100644
--- a/spring-security-thymeleaf/pom.xml
+++ b/spring-security-thymeleaf/pom.xml
@@ -10,10 +10,10 @@
     <description>Spring Security with Thymeleaf tutorial</description>
 
     <parent>
-        <artifactId>parent-boot-5</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-5</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
diff --git a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
index 687c0c2e39..0a4344db4d 100644
--- a/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
+++ b/spring-security-thymeleaf/src/main/java/com/baeldung/springsecuritythymeleaf/SecurityConfiguration.java
@@ -1,11 +1,13 @@
 package com.baeldung.springsecuritythymeleaf;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 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.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 @Configuration
@@ -33,11 +35,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
         auth.inMemoryAuthentication()
             .withUser("user")
-            .password("password")
+            .password(passwordEncoder().encode("password"))
             .roles("USER")
             .and()
             .withUser("admin")
-            .password("admin")
+            .password(passwordEncoder().encode("admin"))
             .roles("ADMIN");
     }
+    
+    @Bean
+    public BCryptPasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
 }