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.1.x'

Browse Source
This commit is contained in:
Stéphane Nicoll
2026-09-08 19:00:07 +02:00
parent b6aadce4a0 163fac2cb1
commit a6d43b9ac6
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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 { class DataElasticsearchReactiveRepositoriesAutoConfigurationTests {
@Container @Container
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(ElasticsearchContainer.class); static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchClientAutoConfiguration.class, .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 { class DataElasticsearchRepositoriesAutoConfigurationTests {
@Container @Container
static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container(ElasticsearchContainer.class); static final ElasticsearchContainer elasticsearch = TestImage.ELASTICSEARCH.container();
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class, .withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class,
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 @Container
@ServiceConnection @ServiceConnection
@PemTrustStore(certificate = "classpath:ssl.crt") @PemTrustStore(certificate = "classpath:ssl.crt")
static final ElasticsearchContainer elasticSearch = TestImage.forContainer(SecureElasticsearchContainer.class); static final ElasticsearchContainer elasticSearch = TestImage.ELASTICSEARCH
.container(SecureElasticsearchContainer.class);
@Autowired @Autowired
private ElasticsearchTemplate elasticsearchTemplate; private ElasticsearchTemplate elasticsearchTemplate;