Merge branch '5.8.x' into 6.0.x

Closes gh-13406

docs/modules/ROOT/pages/servlet/integrations/data.adoc

@@ -9,8 +9,10 @@ It is not only useful but necessary to include the user in the queries to suppor
 
 To use this support, add `org.springframework.security:spring-security-data` dependency and provide a bean of type `SecurityEvaluationContextExtension`:
 
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 @Bean
@@ -19,7 +21,8 @@ public SecurityEvaluationContextExtension securityEvaluationContextExtension() {
 }
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 @Bean
@@ -27,24 +30,24 @@ fun securityEvaluationContextExtension(): SecurityEvaluationContextExtension {
 	return SecurityEvaluationContextExtension()
 }
 ----
-====
+======
 
 In XML Configuration, this would look like:
 
-====
 [source,xml]
 ----
 <bean class="org.springframework.security.data.repository.query.SecurityEvaluationContextExtension"/>
 ----
-====
 
 [[data-query]]
 == Security Expressions within @Query
 
 Now you can use Spring Security within your queries:
 
-====
-.Java
+[tabs]
+======
+Java::
++
 [source,java,role="primary"]
 ----
 @Repository
@@ -54,7 +57,8 @@ public interface MessageRepository extends PagingAndSortingRepository<Message,Lo
 }
 ----
 
-.Kotlin
+Kotlin::
++
 [source,kotlin,role="secondary"]
 ----
 @Repository
@@ -63,7 +67,7 @@ interface MessageRepository : PagingAndSortingRepository<Message,Long> {
 	fun findInbox(pageable: Pageable): Page<Message>
 }
 ----
-====
+======
 
 This checks to see if the `Authentication.getPrincipal().getId()` is equal to the recipient of the `Message`.
 Note that this example assumes you have customized the principal to be an Object that has an id property.