Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade to Netty 4.2.0.Final"

Browse Source 
This reverts commit a7a80a6f34.

See gh-45122
This commit is contained in:
Moritz Halbritter
2025-04-11 14:12:51 +02:00
parent 7b7a11d55a
commit 541a5e673b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java
View File

@@ -21,9 +21,7 @@ import com.mongodb.MongoClientSettings.Builder;
import com.mongodb.connection.TransportSettings;
import com.mongodb.reactivestreams.client.MongoClient;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.IoHandlerFactory;
import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.nio.NioIoHandler;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import reactor.core.publisher.Flux;
@@ -88,7 +86,7 @@ public class MongoReactiveAutoConfiguration {
}
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass({ SocketChannel.class, MultiThreadIoEventLoopGroup.class })
@ConditionalOnClass({ SocketChannel.class, NioEventLoopGroup.class })
static class NettyDriverConfiguration {
@Bean
@@ -117,8 +115,7 @@ public class MongoReactiveAutoConfiguration {
@Override
public void customize(Builder builder) {
if (!isCustomTransportConfiguration(this.settings.getIfAvailable())) {
IoHandlerFactory ioHandlerFactory = NioIoHandler.newFactory();
MultiThreadIoEventLoopGroup eventLoopGroup = new MultiThreadIoEventLoopGroup(ioHandlerFactory);
NioEventLoopGroup eventLoopGroup = new NioEventLoopGroup();
this.eventLoopGroup = eventLoopGroup;
builder.transportSettings(TransportSettings.nettyBuilder().eventLoopGroup(eventLoopGroup).build());
}

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

@@ -1646,7 +1646,7 @@ bom {
releaseNotes("https://github.com/neo4j/neo4j-java-driver/releases/tag/{version}")
}
}
library("Netty", "4.2.0.Final") {
library("Netty", "4.1.119.Final") {
prohibit {
contains ".Alpha"
contains ".Beta"