Merge branch '3.1.x'

Closes gh-38337

spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/testcontainers.adoc

@@ -76,8 +76,7 @@ To do so, add the `@ImportTestcontainers` annotation to your test configuration
 
 include::code:MyContainersConfiguration[]
 
-TIP: You can use the `@ServiceConnection` annotation on `Container` fields to establish service connections.
-You can also add <<features#features.testing.testcontainers.dynamic-properties,`@DynamicPropertySource` annotated methods>> to your declaration class.
+TIP: If you don't intend to use the <<features#features.testing.testcontainers.service-connections, service connections feature>> but want to use <<features#features.testing.testcontainers.dynamic-properties, `@DynamicPropertySource`>> instead, remove the `@ServiceConnection` annotation from the `Container` fields.
 
 
 

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/testcontainers/atdevelopmenttime/importingcontainerdeclarations/MyContainers.java

@@ -20,12 +20,16 @@ import org.testcontainers.containers.MongoDBContainer;
 import org.testcontainers.containers.Neo4jContainer;
 import org.testcontainers.junit.jupiter.Container;
 
+import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
+
 public interface MyContainers {
 
 	@Container
+	@ServiceConnection
 	MongoDBContainer mongoContainer = new MongoDBContainer("mongo:5.0");
 
 	@Container
+	@ServiceConnection
 	Neo4jContainer<?> neo4jContainer = new Neo4jContainer<>("neo4j:5");
 
 }