This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dd7f4a939ecd7b1a642c4f705a3c3d0e19ba20a6 Author: Andriy Redko <[email protected]> AuthorDate: Thu Jun 23 18:15:12 2022 -0400 Update Netty to 4.1.78.Final (cherry picked from commit e4d5c200a8e2b4df6c05c3ac6306e5d6384b81dc) # Conflicts: # distribution/src/main/release/samples/pom.xml (cherry picked from commit ba58c444dd835e105136b9eab74e5c0e9e80914b) # Conflicts: # distribution/src/main/release/samples/pom.xml --- distribution/src/main/release/samples/pom.xml | 2 +- osgi/karaf/features/src/main/resources/features.xml | 2 ++ parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 456fb769ae..e581db85cd 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.6.9</spring.boot.version> <spring.cloud.eureka.version>3.1.1</spring.cloud.eureka.version> <cxf.jetty9.version>9.4.48.v20220622</cxf.jetty9.version> - <cxf.netty.version>4.1.77.Final</cxf.netty.version> + <cxf.netty.version>4.1.78.Final</cxf.netty.version> <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version> <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version> <cxf.tika.version>2.4.1</cxf.tika.version> diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml index be57c2d14e..d961d3f6ee 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -194,6 +194,7 @@ <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-transport-native-unix-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> <bundle start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle> @@ -206,6 +207,7 @@ <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-transport-native-unix-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> <bundle start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle> diff --git a/parent/pom.xml b/parent/pom.xml index 88da7fc311..45e56b57ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -176,7 +176,7 @@ <cxf.msv.version>2013.6.1</cxf.msv.version> <cxf.neethi.version>3.2.0</cxf.neethi.version> <cxf.netty.version.range>[4,5)</cxf.netty.version.range> - <cxf.netty.version>4.1.77.Final</cxf.netty.version> + <cxf.netty.version>4.1.78.Final</cxf.netty.version> <cxf.netty.tcnative.version>2.0.46.Final</cxf.netty.tcnative.version> <cxf.olingo.version>2.0.11</cxf.olingo.version> <cxf.openjpa.version>3.1.2</cxf.openjpa.version>
