Merge branch '3.1.x'

Closes gh-38048

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.java

@@ -20,6 +20,7 @@ import org.testcontainers.containers.MongoDBContainer;
 
 import org.springframework.boot.devtools.restart.RestartScope;
 import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean;
 
 @TestConfiguration(proxyBeanMethods = false)
@@ -27,6 +28,7 @@ public class MyContainersConfiguration {
 
 	@Bean
 	@RestartScope
+	@ServiceConnection
 	public MongoDBContainer mongoDbContainer() {
 		return new MongoDBContainer("mongo:5.0");
 	}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/testing/testcontainers/atdevelopmenttime/devtools/MyContainersConfiguration.kt

@@ -17,6 +17,7 @@ package org.springframework.boot.docs.features.testing.testcontainers.atdevelopm
 
 import org.springframework.boot.devtools.restart.RestartScope
 import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.springframework.context.annotation.Bean
 import org.testcontainers.containers.MongoDBContainer
 
@@ -25,6 +26,7 @@ class MyContainersConfiguration {
 
 	@Bean
 	@RestartScope
+	@ServiceConnection
 	fun monogDbContainer(): MongoDBContainer {
 		return MongoDBContainer("mongo:5.0")
 	}