Merge branch '3.1.x'

Closes gh-38048
This commit is contained in:
Phillip Webb 2023-10-25 12:37:41 -07:00
commit 464523ac04
2 changed files with 4 additions and 0 deletions

View File

@ -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");
}

View File

@ -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")
}