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/reactive/test/method.adoc
+++ b/docs/modules/ROOT/pages/reactive/test/method.adoc
@@ -4,8 +4,10 @@
 For example, we can test our example from xref:reactive/authorization/method.adoc#jc-erms[EnableReactiveMethodSecurity] by using the same setup and annotations that we used in xref:servlet/test/method.adoc#test-method[Testing Method Security].
 The following minimal sample shows what we can do:

-====
-.Java
+[tabs]
+======
+Java::
+
 [source,java,role="primary"]
 ----
@ExtendWith(SpringExtension.class)
@@ -39,7 +41,8 @@ public class HelloWorldMessageServiceTests {
 }
 ----

-.Kotlin
+Kotlin::
+
 [source,kotlin,role="secondary"]
 ----
@ExtendWith(SpringExtension.class)
@@ -72,4 +75,4 @@ class HelloWorldMessageServiceTests {
    }
 }
 ----
-====
+======