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 2021/12/14 23:10:20 UTC
[cxf] 01/02: Update Netty to 4.1.72.Final (#884)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d3c3fb9eaac76d2b5e2a4fa7152bbe50ad49018e
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 14 16:26:16 2021 -0500
Update Netty to 4.1.72.Final (#884)
(cherry picked from commit bd0cbb621f42899f64d4d769376c1c9218c9e3d4)
# Conflicts:
# parent/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 57d54e9..c467bdb 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -33,7 +33,7 @@
<spring.boot.version>2.3.9.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
<cxf.jetty9.version>9.4.44.v20210927</cxf.jetty9.version>
- <cxf.netty.version>4.1.70.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.72.Final</cxf.netty.version>
<cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
<cxf.swagger.ui.version>3.52.1</cxf.swagger.ui.version>
<cxf.tika.version>1.27</cxf.tika.version>
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 8d9c7f0..5df31e8 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -192,6 +192,7 @@
<feature name="cxf-http-netty-client" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
<bundle dependency="true" start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle>
+ <bundle start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle>
@@ -203,6 +204,7 @@
</feature>
<feature name="cxf-http-netty-server" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
+ <bundle start-level="40">mvn:io.netty/netty-tcnative-classes/${cxf.netty.tcnative.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle>
<bundle start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index b01f6e1..06b7cee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,7 +176,8 @@
<cxf.msv.version>2013.6.1</cxf.msv.version>
<cxf.neethi.version>3.1.1</cxf.neethi.version>
<cxf.netty.version.range>[4,5)</cxf.netty.version.range>
- <cxf.netty.version>4.1.70.Final</cxf.netty.version>
+ <cxf.netty.version>4.1.72.Final</cxf.netty.version>
+ <cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version>
<cxf.oauth.version>20100527</cxf.oauth.version>
<cxf.olingo.version>2.0.11</cxf.olingo.version>
<cxf.openjpa.version>3.1.2</cxf.openjpa.version>