Skip to content

Commit eb9df8e

Browse files
committed
Adapt to changes in Spring Data Elasticsearch's transitive deps
See gh-31611
1 parent 21f5f43 commit eb9df8e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.stream.Collectors;
2424

2525
import org.elasticsearch.ElasticsearchException;
26+
import org.elasticsearch.client.indices.GetIndexRequest;
2627
import reactor.netty.http.client.HttpClient;
2728

2829
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -50,7 +51,8 @@
5051
* @since 3.0.0
5152
*/
5253
@AutoConfiguration
53-
@ConditionalOnClass({ ReactiveRestClients.class, ElasticsearchException.class, WebClient.class, HttpClient.class })
54+
@ConditionalOnClass({ ReactiveRestClients.class, ElasticsearchException.class, GetIndexRequest.class, WebClient.class,
55+
HttpClient.class })
5456
@EnableConfigurationProperties(ElasticsearchProperties.class)
5557
@SuppressWarnings("deprecation")
5658
public class ReactiveElasticsearchClientAutoConfiguration {

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ dependencies {
103103
testImplementation("org.thymeleaf:thymeleaf")
104104

105105
testRuntimeOnly("org.elasticsearch:elasticsearch")
106+
testRuntimeOnly("org.elasticsearch.client:elasticsearch-rest-high-level-client") {
107+
exclude group: "commons-logging", module: "commons-logging"
108+
}
106109
}
107110

108111
configurations {

0 commit comments

Comments
 (0)