This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f162593f669 CSB-21999: Downgrade Netty (#17826)
f162593f669 is described below
commit f162593f6693956125be7d6389c0a312ffff616d
Author: Federico Mariani <[email protected]>
AuthorDate: Tue Apr 22 14:19:12 2025 +0200
CSB-21999: Downgrade Netty (#17826)
---
.../camel/component/knative/http/KnativeHttpTest.java | 6 ------
.../component/netty/NettyServerBossPoolBuilder.java | 19 +++++++++----------
parent/pom.xml | 2 +-
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
index 103845a526c..cf64d5c696f 100644
---
a/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
+++
b/components/camel-knative/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpTest.java
@@ -51,7 +51,6 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -75,11 +74,6 @@ public class KnativeHttpTest {
private int platformHttpPort;
private String platformHttpHost;
- @BeforeAll
- public static void beforeAll() {
-
System.setProperty("io.netty.handler.ssl.defaultEndpointVerificationAlgorithm",
"NONE");
- }
-
// **************************
//
// Setup
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBossPoolBuilder.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBossPoolBuilder.java
index f07cd3d7811..50297b729a9 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBossPoolBuilder.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyServerBossPoolBuilder.java
@@ -17,12 +17,11 @@
package org.apache.camel.component.netty;
import io.netty.channel.EventLoopGroup;
-import io.netty.channel.MultiThreadIoEventLoopGroup;
import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollIoHandler;
+import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.channel.kqueue.KQueue;
-import io.netty.channel.kqueue.KQueueIoHandler;
-import io.netty.channel.nio.NioIoHandler;
+import io.netty.channel.kqueue.KQueueEventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
import org.apache.camel.util.concurrent.CamelThreadFactory;
/**
@@ -78,21 +77,21 @@ public final class NettyServerBossPoolBuilder {
public EventLoopGroup build() {
if (nativeTransport) {
if (KQueue.isAvailable()) {
- return new MultiThreadIoEventLoopGroup(
+ return new KQueueEventLoopGroup(
bossCount,
- new CamelThreadFactory(pattern, name, false),
KQueueIoHandler.newFactory());
+ new CamelThreadFactory(pattern, name, false));
} else if (Epoll.isAvailable()) {
- return new MultiThreadIoEventLoopGroup(
+ return new EpollEventLoopGroup(
bossCount,
- new CamelThreadFactory(pattern, name, false),
EpollIoHandler.newFactory());
+ new CamelThreadFactory(pattern, name, false));
} else {
throw new IllegalStateException(
"Unable to use native transport - both Epoll and
KQueue are not available");
}
} else {
- return new MultiThreadIoEventLoopGroup(
+ return new NioEventLoopGroup(
bossCount,
- new CamelThreadFactory(pattern, name, false),
NioIoHandler.newFactory());
+ new CamelThreadFactory(pattern, name, false));
}
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 00e75a08dbe..e0206fd973b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -387,7 +387,7 @@
<narayana-version>5.13.1.Final</narayana-version>
<neoscada-version>0.4.0</neoscada-version>
<neo4j-version>5.28.4</neo4j-version>
- <netty-version>4.2.0.Final</netty-version>
+ <netty-version>4.1.119.Final</netty-version>
<netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
<networknt-json-schema-validator-version>1.5.6</networknt-json-schema-validator-version>
<nimbus-jose-jwt>10.2</nimbus-jose-jwt>
