Merge branch 'master' into BAEL-12731

spring-boot-security/src/main/java/com/baeldung/springbootsecurity/oauth2server/config/WebSecurityConfiguration.java

@@ -0,0 +1,15 @@
+package com.baeldung.springbootsecurity.oauth2server.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    @Bean
+    public AuthenticationManager customAuthenticationManager() throws Exception {
+        return authenticationManager();
+    }
+}

spring-boot-security/src/main/java/com/baeldung/springbootsecurity/oauth2sso/SpringBootOAuth2SsoApplication.java

@@ -1,6 +1,7 @@
 package com.baeldung.springbootsecurity.oauth2sso;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 

spring-boot-security/src/main/resources/application-authz.properties

@@ -1,3 +1,3 @@
-security.user.password=password
+spring.security.user.password=password
 security.oauth2.client.client-id=client
 security.oauth2.client.client-secret=secret

spring-boot-security/src/main/resources/application-taglibs.properties

@@ -1,3 +1,3 @@
 #jsp config
-spring.mvc.view.prefix: /WEB-INF/views/
-spring.mvc.view.suffix: .jsp
+spring.mvc.view.prefix= /WEB-INF/views/
+spring.mvc.view.suffix= .jsp