From eb9df8ebfe989dbc46500c486922f16efcfe64e2 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Thu, 7 Jul 2022 22:22:28 +0100
Subject: [PATCH] Adapt to changes in Spring Data Elasticsearch's transitive
 deps

See gh-31611
---
 .../ReactiveElasticsearchClientAutoConfiguration.java         | 4 +++-
 .../spring-boot-test-autoconfigure/build.gradle               | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfiguration.java
index 42420e96523..02c61a6a1a5 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/ReactiveElasticsearchClientAutoConfiguration.java
@@ -23,6 +23,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.client.indices.GetIndexRequest;
 import reactor.netty.http.client.HttpClient;
 
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -50,7 +51,8 @@ import org.springframework.web.reactive.function.client.WebClient;
  * @since 3.0.0
  */
 @AutoConfiguration
-@ConditionalOnClass({ ReactiveRestClients.class, ElasticsearchException.class, WebClient.class, HttpClient.class })
+@ConditionalOnClass({ ReactiveRestClients.class, ElasticsearchException.class, GetIndexRequest.class, WebClient.class,
+		HttpClient.class })
 @EnableConfigurationProperties(ElasticsearchProperties.class)
 @SuppressWarnings("deprecation")
 public class ReactiveElasticsearchClientAutoConfiguration {
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
index a8c7779eec7..382fb6dec7a 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
+++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle
@@ -103,6 +103,9 @@ dependencies {
 	testImplementation("org.thymeleaf:thymeleaf")
 	
 	testRuntimeOnly("org.elasticsearch:elasticsearch")
+	testRuntimeOnly("org.elasticsearch.client:elasticsearch-rest-high-level-client") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
 }
 
 configurations {