spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-11 12:19:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51628
This commit is contained in:
Stéphane Nicoll
2026-09-08 16:57:00 +02:00
parent e7a324357f b1e91c942e
commit 18292d400c
132 changed files with 209 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisAnnotationDrivenConfigurationIntegrationTests.java
+1 -1
View File
@@ -42,7 +42,7 @@ import static org.awaitility.Awaitility.await;
class DataRedisAnnotationDrivenConfigurationIntegrationTests {
@Container
static final RedisContainer redis = TestImage.container(RedisContainer.class);
static final RedisContainer redis = TestImage.forContainer(RedisContainer.class);
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(DataRedisAutoConfiguration.class))
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/autoconfigure/DataRedisRepositoriesAutoConfigurationTests.java
+1 -1
View File
@@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataRedisRepositoriesAutoConfigurationTests {
@Container
public static RedisContainer redis = TestImage.container(RedisContainer.class);
public static RedisContainer redis = TestImage.forContainer(RedisContainer.class);
private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisContainerConnectionDetailsFactoryTests.java
+1 -1
View File
@@ -45,7 +45,7 @@ class RedisContainerConnectionDetailsFactoryTests {
@Container
@ServiceConnection
static final RedisContainer redis = TestImage.container(RedisContainer.class);
static final RedisContainer redis = TestImage.forContainer(RedisContainer.class);
@Autowired(required = false)
private DataRedisConnectionDetails connectionDetails;
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackContainerConnectionDetailsFactoryTests.java
+1 -1
View File
@@ -46,7 +46,7 @@ class RedisStackContainerConnectionDetailsFactoryTests {
@Container
@ServiceConnection
static final RedisStackContainer redis = TestImage.container(RedisStackContainer.class);
static final RedisStackContainer redis = TestImage.forContainer(RedisStackContainer.class);
@Autowired(required = false)
private DataRedisConnectionDetails connectionDetails;
module/spring-boot-data-redis/src/dockerTest/java/org/springframework/boot/data/redis/testcontainers/RedisStackServerContainerConnectionDetailsFactoryTests.java
+1 -1
View File
@@ -46,7 +46,7 @@ class RedisStackServerContainerConnectionDetailsFactoryTests {
@Container
@ServiceConnection
static final RedisStackServerContainer redis = TestImage.container(RedisStackServerContainer.class);
static final RedisStackServerContainer redis = TestImage.forContainer(RedisStackServerContainer.class);
@Autowired(required = false)
private DataRedisConnectionDetails connectionDetails;