Skip to content

Commit 0d472d6

Browse files
committed
Start building against Spring Data 2020.0.2 snapshots
See gh-24284
1 parent 922a7a4 commit 0d472d6

File tree

4 files changed

+2
-8
lines changed

4 files changed

+2
-8
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisHealthIndicator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {
5151
doHealthCheck(builder, connection);
5252
}
5353
finally {
54-
RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory, false);
54+
RedisConnectionUtils.releaseConnection(connection, this.redisConnectionFactory);
5555
}
5656
}
5757

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
import org.springframework.context.ApplicationContext;
3636
import org.springframework.context.annotation.Bean;
3737
import org.springframework.context.annotation.Configuration;
38-
import org.springframework.context.annotation.Import;
39-
import org.springframework.data.neo4j.config.Neo4jDefaultCallbacksRegistrar;
4038
import org.springframework.data.neo4j.core.DatabaseSelectionProvider;
4139
import org.springframework.data.neo4j.core.Neo4jClient;
4240
import org.springframework.data.neo4j.core.Neo4jOperations;
@@ -66,7 +64,6 @@
6664
@ConditionalOnBean(Driver.class)
6765
@AutoConfigureBefore(TransactionAutoConfiguration.class)
6866
@AutoConfigureAfter(Neo4jAutoConfiguration.class)
69-
@Import(Neo4jDefaultCallbacksRegistrar.class)
7067
public class Neo4jDataAutoConfiguration {
7168

7269
@Bean

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jReactiveDataAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2727
import org.springframework.context.annotation.Bean;
2828
import org.springframework.context.annotation.Configuration;
29-
import org.springframework.context.annotation.Import;
30-
import org.springframework.data.neo4j.config.Neo4jDefaultReactiveCallbacksRegistrar;
3129
import org.springframework.data.neo4j.core.ReactiveDatabaseSelectionProvider;
3230
import org.springframework.data.neo4j.core.ReactiveNeo4jClient;
3331
import org.springframework.data.neo4j.core.ReactiveNeo4jOperations;
@@ -48,7 +46,6 @@
4846
@ConditionalOnClass({ Driver.class, ReactiveNeo4jTemplate.class, ReactiveTransactionManager.class, Flux.class })
4947
@ConditionalOnBean(Driver.class)
5048
@AutoConfigureAfter(Neo4jDataAutoConfiguration.class)
51-
@Import(Neo4jDefaultReactiveCallbacksRegistrar.class)
5249
public class Neo4jReactiveDataAutoConfiguration {
5350

5451
@Bean

spring-boot-project/spring-boot-dependencies/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1557,7 +1557,7 @@ bom {
15571557
]
15581558
}
15591559
}
1560-
library("Spring Data Bom", "2020.0.1") {
1560+
library("Spring Data Bom", "2020.0.2-SNAPSHOT") {
15611561
group("org.springframework.data") {
15621562
imports = [
15631563
"spring-data-bom"

0 commit comments

Comments
 (0)