Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in Spring Data Elasticsearch's transitive deps

Browse Source 
See gh-31611
This commit is contained in:
Andy Wilkinson 2022-07-07 22:22:28 +01:00
parent 21f5f43365
commit eb9df8ebfe
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 {

3
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@ -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 {