Merge branch '5.8.x'

Author: Steve Riesenberg

config/src/main/kotlin/org/springframework/security/config/annotation/web/OAuth2LoginDsl.kt

@@ -131,8 +131,8 @@ class OAuth2LoginDsl {
      * @EnableWebSecurity
      * class SecurityConfig {
      *
-     *  @Bean
-     *  fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
+     *     @Bean
+     *     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
      *         http {
      *             oauth2Login {
      *                 tokenEndpoint {
@@ -141,7 +141,7 @@ class OAuth2LoginDsl {
      *             }
      *         }
      *         return http.build()
-     *  }
+     *     }
      * }
      * ```
      *
@@ -163,8 +163,8 @@ class OAuth2LoginDsl {
      * @EnableWebSecurity
      * class SecurityConfig {
      *
-     *  @Bean
-     *  fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
+     *     @Bean
+     *     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
      *         http {
      *             oauth2Login {
      *                 redirectionEndpoint {
@@ -173,7 +173,7 @@ class OAuth2LoginDsl {
      *             }
      *         }
      *         return http.build()
-     *  }
+     *     }
      * }
      * ```
      *
@@ -195,8 +195,8 @@ class OAuth2LoginDsl {
      * @EnableWebSecurity
      * class SecurityConfig {
      *
-     *  @Bean
-     *  fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
+     *     @Bean
+     *     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
      *         http {
      *             oauth2Login {
      *                 userInfoEndpoint {
@@ -205,7 +205,7 @@ class OAuth2LoginDsl {
      *             }
      *         }
      *         return http.build()
-     *  }
+     *     }
      * }
      * ```
      *

config/src/main/kotlin/org/springframework/security/config/annotation/web/SessionManagementDsl.kt

@@ -54,15 +54,15 @@ class SessionManagementDsl {
      * @EnableWebSecurity
      * class SecurityConfig {
      *
-     *  @Bean
-     *  fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
+     *     @Bean
+     *     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
      *         http {
      *             sessionManagement {
      *                 sessionFixation { }
      *             }
      *         }
      *         return http.build()
-     *  }
+     *     }
      * }
      * ```
      *
@@ -84,8 +84,8 @@ class SessionManagementDsl {
      * @EnableWebSecurity
      * class SecurityConfig {
      *
-     *  @Bean
-     *  fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
+     *     @Bean
+     *     fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
      *         http {
      *             sessionManagement {
      *                 sessionConcurrency {
@@ -95,7 +95,7 @@ class SessionManagementDsl {
      *             }
      *         }
      *         return http.build()
-     *  }
+     *     }
      * }
      * ```
      *