You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2026/06/03 00:37:22 UTC
(cxf) branch 4.1.x-fixes updated (5e2367070c4 -> 972a4c8090f)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 5e2367070c4 Recording .gitmergeinfo Changes
new 73fea10af64 Fix org.apache.cxf.systest.http2.netty.NettyClientServerHttp2Test test cases (due to Netty changes)
new 5c86b7aa386 Recording .gitmergeinfo Changes
new 972a4c8090f Update Netty to 4.1.135.Final
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 1 +
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
.../cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java | 5 +++--
4 files changed, 6 insertions(+), 4 deletions(-)
(cxf) 01/03: Fix org.apache.cxf.systest.http2.netty.NettyClientServerHttp2Test test cases (due to Netty changes)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 73fea10af64af801ae7be2de23380172f06e76ac
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 2 18:38:57 2026 -0400
Fix org.apache.cxf.systest.http2.netty.NettyClientServerHttp2Test test cases (due to Netty changes)
(cherry picked from commit 59d04c3deeb2be6cf107e2009c3af84d8aaa7e49)
---
.../cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java b/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java
index 4d888abd453..11e6627326b 100644
--- a/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java
+++ b/systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java
@@ -25,7 +25,8 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transport.http.netty.client.NettyHttpConduit;
-import org.apache.cxf.transport.https.InsecureTrustManager;
+
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
import org.junit.Test;
@@ -161,7 +162,7 @@ abstract class AbstractNettyClientServerHttp2Test extends AbstractBusClientServe
}
// Create TrustManager instance which trusts all clients and servers
- params.setTrustManagers(InsecureTrustManager.getNoOpX509TrustManagers());
+ params.setTrustManagers(InsecureTrustManagerFactory.INSTANCE.getTrustManagers());
params.setDisableCNCheck(true);
}
(cxf) 02/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5c86b7aa3860236714f45bb4b05c9249152292e1
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 2 18:39:57 2026 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 21f1b60c924..6883c84d167 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -29,6 +29,7 @@ M 08544d2ead3916b7a682cc886bcdd50202291d9a
M 08abe18dc90ea794eba1e627535061f7a3c1c910
M 0aeb3b880dc885f934efac3e8cfdc8f6393b2073
M 0b8ae6be6269c4fd163e7ca10111342f3abb3451
+M 0c07da74d6afe71d0bc267dcb4cbafdab1bfb206
M 0cea81ce0e4bc9abe15ce4d8cafedd36b16ee2eb
M 0fc3688402419a20a84784b0eed84470223999f4
M 1074a252683dcfdd7e1ad36fa5fb88e3d8e52e9a
(cxf) 03/03: Update Netty to 4.1.135.Final
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 4.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 972a4c8090f0eaab8b2c1c37ec75cfa72a289ad0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 2 20:36:56 2026 -0400
Update Netty to 4.1.135.Final
---
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 513d0d04e4f..6fed91edd4c 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -34,7 +34,7 @@
<cxf.spring.boot.version>3.4.13</cxf.spring.boot.version>
<cxf.spring.cloud.eureka.version>4.2.3</cxf.spring.cloud.eureka.version>
<cxf.jetty12.version>12.0.34</cxf.jetty12.version>
- <cxf.netty.version>4.1.134.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.135.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>5.32.5</cxf.swagger.ui.version>
<cxf.tika.version>3.3.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index d05ed4d2085..6452e697e1d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,7 @@
<cxf.msv.version>2022.7</cxf.msv.version>
<cxf.neethi.version>3.2.2</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.134.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.135.Final</cxf.netty.version>
<cxf.netty.tcnative.version>2.0.69.Final</cxf.netty.tcnative.version>
<cxf.olingo.version>2.0.13</cxf.olingo.version>
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>