Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-43950
This commit is contained in:
Andy Wilkinson
2025-01-24 08:46:21 +00:00
parent a244a74286 71c96438ed
commit c7b54dcbb3
11 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTest.java → spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/ServiceConnectionStartsConnectionOnceIntegrationTests.java
View File

@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@SpringJUnitConfig
@Testcontainers(disabledWithoutDocker = true)
class ServiceConnectionStartsConnectionOnceIntegrationTest {
class ServiceConnectionStartsConnectionOnceIntegrationTests {
@Container
@ServiceConnection

2
spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/context/ImportTestcontainers.java
View File

@@ -30,7 +30,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Import;
/**
* Imports idiomatic Testcontainer declaration classes into the Spring
* Imports idiomatic Testcontainers declaration classes into the Spring
* {@link ApplicationContext}. The following elements will be considered from the imported
* classes:
* <ul>