Merge branch '3.4.x'

Closes gh-44685
This commit is contained in:
Stéphane Nicoll
2025-03-12 08:59:09 +01:00
20 changed files with 36 additions and 44 deletions

View File

@@ -4,7 +4,7 @@ plugins {
id "org.springframework.boot.docker-test"
}
description = "Spring Boot Data ElasticSearch smoke test"
description = "Spring Boot Data Elasticsearch smoke test"
dependencies {
dockerTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))

View File

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

View File

@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@Testcontainers(disabledWithoutDocker = true)
@DataElasticsearchTest
class SampleElasticSearchApplicationTests {
class SampleElasticsearchApplicationTests {
@Container
@ServiceConnection

View File

@@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat;
@Testcontainers(disabledWithoutDocker = true)
@DataElasticsearchTest(
properties = { "spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s" })
class SampleElasticSearchSslApplicationTests {
class SampleElasticsearchSslApplicationTests {
@Container
@ServiceConnection