Start building against Spring Data 2020.0.2 snapshots

See spring-projectsgh-24284
snicoll · Dec 8, 2020 · 429ffa4 · 429ffa4
1 parent e0c6ad0
commit 429ffa4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/...t-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java b/...t-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java
@@ -51,7 +51,7 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {
 			doHealthCheck(builder, connection);
 		}
 		finally {
-			RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory, false);
+			RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory);
 		}
 	}
 

diff --git a/...in/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java b/...in/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java
@@ -35,8 +35,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.neo4j.config.Neo4jDefaultCallbacksRegistrar;
 import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.Neo4jClient;
 import org.springframework.data.neo4j.core.Neo4jOperations;
@@ -66,7 +64,6 @@
 @ConditionalOnBean(Driver.class)
 @AutoConfigureBefore(TransactionAutoConfiguration.class)
 @AutoConfigureAfter(Neo4jAutoConfiguration.class)
-@Import(Neo4jDefaultCallbacksRegistrar.class)
 public class Neo4jDataAutoConfiguration {
 
 	@Bean

diff --git a/...org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfiguration.java b/...org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfiguration.java
@@ -26,8 +26,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.neo4j.config.Neo4jDefaultReactiveCallbacksRegistrar;
 import org.springframework.data.neo4j.core.ReactiveDatabaseSelectionProvider;
 import org.springframework.data.neo4j.core.ReactiveNeo4jClient;
 import org.springframework.data.neo4j.core.ReactiveNeo4jOperations;
@@ -48,7 +46,6 @@
 @ConditionalOnClass({ Driver.class, ReactiveNeo4jTemplate.class, ReactiveTransactionManager.class, Flux.class })
 @ConditionalOnBean(Driver.class)
 @AutoConfigureAfter(Neo4jDataAutoConfiguration.class)
-@Import(Neo4jDefaultReactiveCallbacksRegistrar.class)
 public class Neo4jReactiveDataAutoConfiguration {
 
 	@Bean

diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1557,7 +1557,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Data Bom", "2020.0.1") {
+	library("Spring Data Bom", "2020.0.2-SNAPSHOT") {
 		group("org.springframework.data") {
 			imports = [
 				"spring-data-bom"