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 2022/06/23 23:42:48 UTC
[cxf] branch 3.5.x-fixes updated (12efebccb4 -> e441840c02)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 12efebccb4 Update Spring Boot to 2.6.9
new dd7f4a939e Update Netty to 4.1.78.Final
new e441840c02 Recording .gitmergeinfo Changes
The 2 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 | 3 +++
distribution/src/main/release/samples/pom.xml | 2 +-
osgi/karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
[cxf] 02/02: 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 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e441840c0212b8559ad406595fa4174a29124652
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 23 19:22:57 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6edb854997..1b9032daf1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -2,6 +2,7 @@ origin/3.6.x-fixes
B 00bbab65e59b8f27366335aec19e50129b7759f0
B 12a68910220a3af6fe2d0419a3556320b75c3523
+B 21bf42d906765fffb015f86d49e7b535d927bc56
B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
B 4b63dbb428488f3a6d0b7114632404b31458a521
B 6d64fdb0d9219ca829f29a2f38480033b60a4c98
@@ -41,6 +42,8 @@ M 97dc25412eac3342f643ea5faa38c9718d2139bf
M a75b56a7c3826a48320202aca771cbcbdca6a350
M a903a5392b3cd2b5925c6afa46f289b3b94a694a
M b207c718e84bed8120bb114f1d79f575094c3a14
+M b5faf57b6f696c1487fc6f12795e9113f1f804a6
+M ba58c444dd835e105136b9eab74e5c0e9e80914b
M c4c9de9f13d3a65e3f532e2a72dc784ed3f36366
M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
M ca7b6d8daff836949e95f41ef825155d66e512e2
[cxf] 01/02: Update Netty to 4.1.78.Final
Posted by re...@apache.org.
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 <dr...@gmail.com>
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>