Merge branch '5.8.x' into 6.0.x

Closes gh-13406
2023-06-18 21:33:58 -05:00
parent be0c2bd44c 7da99acca7
commit f66a5bab99
116 changed files with 4826 additions and 3206 deletions
--- a/docs/modules/ROOT/pages/servlet/authentication/passwords/basic.adoc
+++ b/docs/modules/ROOT/pages/servlet/authentication/passwords/basic.adoc
@@ -60,9 +60,11 @@ However, as soon as any servlet based configuration is provided, HTTP Basic must
 The following example shows a minimal, explicit configuration:

 .Explicit HTTP Basic Configuration
-====
+[tabs]
+======
+Java::
+
 [source,java,role="primary"]
-.Java
 ----
@Bean
 public SecurityFilterChain filterChain(HttpSecurity http) {
@@ -73,8 +75,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) {
 }
 ----

+XML::
+
 [source,xml,role="secondary"]
-.XML
 ----
 <http>
 	<!-- ... -->
@@ -82,8 +85,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) {
 </http>
 ----

+Kotlin::
+
 [source,kotlin,role="secondary"]
-.Kotlin
 ----
@Bean
 open fun filterChain(http: HttpSecurity): SecurityFilterChain {
@@ -94,4 +98,4 @@ open fun filterChain(http: HttpSecurity): SecurityFilterChain {
 	return http.build()
 }
 ----
-====
+======