root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Upgrade to Lettuce 6.2.0.RELEASE 

Closes gh-31761
This commit is contained in:
Stephane Nicoll 2022-07-15 11:39:43 +02:00
parent 5ac431bf0e
commit 92b8bcbdac
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,9 @@ import io.lettuce.core.TimeoutOptions;
import io.lettuce.core.cluster.ClusterClientOptions; import io.lettuce.core.cluster.ClusterClientOptions;
import io.lettuce.core.cluster.ClusterTopologyRefreshOptions; import io.lettuce.core.cluster.ClusterTopologyRefreshOptions;
import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.Builder; import io.lettuce.core.cluster.ClusterTopologyRefreshOptions.Builder;
import io.lettuce.core.event.Event;
import io.lettuce.core.event.EventBus;
import io.lettuce.core.resource.ClientResources; import io.lettuce.core.resource.ClientResources;
import io.lettuce.core.resource.DefaultClientResources; import io.lettuce.core.resource.DefaultClientResources;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import reactor.core.publisher.Flux;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@ -72,18 +69,6 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration {
@ConditionalOnMissingBean(ClientResources.class) @ConditionalOnMissingBean(ClientResources.class)
DefaultClientResources lettuceClientResources(ObjectProvider<ClientResourcesBuilderCustomizer> customizers) { DefaultClientResources lettuceClientResources(ObjectProvider<ClientResourcesBuilderCustomizer> customizers) {
DefaultClientResources.Builder builder = DefaultClientResources.builder(); DefaultClientResources.Builder builder = DefaultClientResources.builder();
builder.eventBus(new EventBus() {
@Override
public Flux<Event> get() {
return Flux.empty();
}
@Override
public void publish(Event event) {
}
});
customizers.orderedStream().forEach((customizer) -> customizer.customize(builder)); customizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
return builder.build(); return builder.build();
} }

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@ -846,7 +846,7 @@ bom {
] ]
} }
} }
library("Lettuce", "6.1.8.RELEASE") { library("Lettuce", "6.2.0.RELEASE") {
group("io.lettuce") { group("io.lettuce") {
modules = [ modules = [
"lettuce-core" "lettuce-core"