spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source
This commit is contained in:
Stéphane Nicoll
2026-09-08 18:30:45 +02:00
parent 7c11fcf97f 4fc987180d
commit 163fac2cb1
10 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestIntegrationTests.java
+1 -1
View File
@@ -49,7 +49,7 @@ class DataElasticsearchTestIntegrationTests {
@Container
@ServiceConnection
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
@Autowired
private ElasticsearchTemplate elasticsearchTemplate;
module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestPropertiesIntegrationTests.java
+1 -1
View File
@@ -44,7 +44,7 @@ class DataElasticsearchTestPropertiesIntegrationTests {
@Container
@ServiceConnection
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
@Autowired
private Environment environment;
module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestReactiveIntegrationTests.java
+1 -1
View File
@@ -45,7 +45,7 @@ class DataElasticsearchTestReactiveIntegrationTests {
@Container
@ServiceConnection
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
@Autowired
private ReactiveElasticsearchTemplate elasticsearchTemplate;
module/spring-boot-data-elasticsearch-test/src/dockerTest/java/org/springframework/boot/data/elasticsearch/test/autoconfigure/DataElasticsearchTestWithIncludeFilterIntegrationTests.java
+1 -1
View File
@@ -46,7 +46,7 @@ class DataElasticsearchTestWithIncludeFilterIntegrationTests {
@Container
@ServiceConnection
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
@Autowired
private ExampleRepository exampleRepository;
module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchReactiveRepositoriesAutoConfigurationTests.java
+1 -1
View File
@@ -51,7 +51,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataElasticsearchReactiveRepositoriesAutoConfigurationTests {
@Container
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchClientAutoConfiguration.class,
module/spring-boot-data-elasticsearch/src/dockerTest/java/org/springframework/boot/data/elasticsearch/autoconfigure/DataElasticsearchRepositoriesAutoConfigurationTests.java
+1 -1
View File
@@ -49,7 +49,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class DataElasticsearchRepositoriesAutoConfigurationTests {
@Container
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,
module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchClientAutoConfigurationIntegrationTests.java
+1 -1
View File
@@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class ElasticsearchClientAutoConfigurationIntegrationTests {
@Container
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class,
module/spring-boot-elasticsearch/src/dockerTest/java/org/springframework/boot/elasticsearch/autoconfigure/ElasticsearchRestClientAutoConfigurationIntegrationTests.java
+1 -1
View File
@@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
class ElasticsearchRestClientAutoConfigurationIntegrationTests {
@Container
static final ElasticsearchContainer elasticsearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class));
smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchApplicationTests.java
+1 -1
View File
@@ -42,7 +42,7 @@ class SampleDataElasticsearchApplicationTests {
@Container
@ServiceConnection
static final ElasticsearchContainer elasticSearch = TestImage.forContainer(ElasticsearchContainer.class);
static final ElasticsearchContainer elasticSearch = TestImage.ELASTICSEARCH.container();
@Autowired
private ElasticsearchTemplate elasticsearchTemplate;
smoke-test/spring-boot-smoke-test-data-elasticsearch/src/dockerTest/java/smoketest/data/elasticsearch/SampleDataElasticsearchSslApplicationTests.java
+2 -1
View File
@@ -45,7 +45,8 @@ class SampleDataElasticsearchSslApplicationTests {
@Container
@ServiceConnection
@PemTrustStore(certificate = "classpath:ssl.crt")
static final ElasticsearchContainer elasticSearch = TestImage.forContainer(SecureElasticsearchContainer.class);
static final ElasticsearchContainer elasticSearch = TestImage.ELASTICSEARCH
.container(SecureElasticsearchContainer.class);
@Autowired
private ElasticsearchTemplate elasticsearchTemplate;