From 62a70475c2ad20617e1853b5738f083d400da2fc Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Apr 2021 13:30:20 +0200 Subject: [PATCH 1/2] Fix class condition on deprecated class Closes gh-26107 --- .../elasticsearch/ElasticsearchDataAutoConfiguration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java index 87e8a50000..a9a1ee0bad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; +import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories; @@ -38,7 +38,7 @@ import org.springframework.data.elasticsearch.repository.config.EnableReactiveEl * @since 1.1.0 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass({ ElasticsearchTemplate.class }) +@ConditionalOnClass({ ElasticsearchRestTemplate.class }) @AutoConfigureAfter({ ElasticsearchRestClientAutoConfiguration.class, ReactiveElasticsearchRestClientAutoConfiguration.class }) @Import({ ElasticsearchDataConfiguration.BaseConfiguration.class, From 1de2dd9ecbdb2986266f640e39b0ca3984437c3f Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 14 Apr 2021 13:31:16 +0200 Subject: [PATCH 2/2] Upgrade to Spring Data Neumann-SR9 Closes gh-25905 --- spring-boot-project/spring-boot-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle index 7aac9386fd..d2c20e18ed 100644 --- a/spring-boot-project/spring-boot-dependencies/build.gradle +++ b/spring-boot-project/spring-boot-dependencies/build.gradle @@ -1666,7 +1666,7 @@ bom { ] } } - library("Spring Data Releasetrain", "Neumann-BUILD-SNAPSHOT") { + library("Spring Data Releasetrain", "Neumann-SR9") { group("org.springframework.data") { imports = [ "spring-data-releasetrain"