Merge branch '2.6.x' into 2.7.x

Closes gh-32515

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/springbootapplications/jmx/MyJmxTests.java

@@ -19,16 +19,13 @@
 import javax.management.MBeanServer;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(properties = "spring.jmx.enabled=true")
 @DirtiesContext
 class MyJmxTests {

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/testing/springbootapplications/jmx/MyJmxTests.kt

@@ -18,14 +18,11 @@ package org.springframework.boot.docs.features.testing.springbootapplications.jm
 
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.test.annotation.DirtiesContext
-import org.springframework.test.context.junit.jupiter.SpringExtension
 import javax.management.MBeanServer
 
-@ExtendWith(SpringExtension::class)
 @SpringBootTest(properties = ["spring.jmx.enabled=true"])
 @DirtiesContext
 class MyJmxTests(@Autowired val mBeanServer: MBeanServer) {