diff --git a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java index 80d0aba0c69..3ec5e555319 100644 --- a/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java +++ b/module/spring-boot-data-redis/src/main/java/org/springframework/boot/data/redis/autoconfigure/JedisConnectionConfiguration.java @@ -19,8 +19,8 @@ package org.springframework.boot.data.redis.autoconfigure; import javax.net.ssl.SSLParameters; import org.apache.commons.pool2.impl.GenericObjectPool; +import redis.clients.jedis.ConnectionPoolConfig; import redis.clients.jedis.Jedis; -import redis.clients.jedis.JedisPoolConfig; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -151,11 +151,11 @@ class JedisConnectionConfiguration extends DataRedisConnectionConfiguration { private void applyPooling(DataRedisProperties.Pool pool, JedisClientConfiguration.JedisClientConfigurationBuilder builder) { - builder.usePooling().poolConfig(jedisPoolConfig(pool)); + builder.usePooling().poolConfig(poolConfig(pool)); } - private JedisPoolConfig jedisPoolConfig(DataRedisProperties.Pool pool) { - JedisPoolConfig config = new JedisPoolConfig(); + private ConnectionPoolConfig poolConfig(DataRedisProperties.Pool pool) { + ConnectionPoolConfig config = new ConnectionPoolConfig(); config.setMaxTotal(pool.getMaxActive()); config.setMaxIdle(pool.getMaxIdle()); config.setMinIdle(pool.getMinIdle()); diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index dd70cf6ec63..c949ce6bad0 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1056,7 +1056,7 @@ bom { releaseNotes("https://github.com/hunterhacker/jdom/releases/tag/JDOM-{version}") } } - library("Jedis", "7.0.0") { + library("Jedis", "7.2.1") { alignWith { property { name "jedis"