Skip to content

Commit 822e7de

Browse files
committed
Start building against Spring Data Bom 2025.0.0-M1 snapshots
See gh-44159
1 parent 1e58f2b commit 822e7de

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.lettuce.core.RedisClient;
2424
import io.lettuce.core.SocketOptions;
2525
import io.lettuce.core.TimeoutOptions;
26+
import io.lettuce.core.api.StatefulConnection;
2627
import io.lettuce.core.cluster.ClusterClientOptions;
2728
import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
2829
import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.Builder;
@@ -251,8 +252,8 @@ LettuceClientConfigurationBuilder createBuilder(Pool properties) {
251252
return LettucePoolingClientConfiguration.builder().poolConfig(getPoolConfig(properties));
252253
}
253254

254-
private GenericObjectPoolConfig<?> getPoolConfig(Pool properties) {
255-
GenericObjectPoolConfig<?> config = new GenericObjectPoolConfig<>();
255+
private GenericObjectPoolConfig<StatefulConnection<?, ?>> getPoolConfig(Pool properties) {
256+
GenericObjectPoolConfig<StatefulConnection<?, ?>> config = new GenericObjectPoolConfig<>();
256257
config.setMaxTotal(properties.getMaxActive());
257258
config.setMaxIdle(properties.getMaxIdle());
258259
config.setMinIdle(properties.getMinIdle());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2228,7 +2228,7 @@ bom {
22282228
releaseNotes("https://github.com/spring-projects/spring-batch/releases/tag/v{version}")
22292229
}
22302230
}
2231-
library("Spring Data Bom", "2024.1.2") {
2231+
library("Spring Data Bom", "2025.0.0-SNAPSHOT") {
22322232
prohibit {
22332233
versionRange "[2025.1.0-M1,)"
22342234
because "it exceeds our baseline"

0 commit comments

Comments
 (0)