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/24 02:36:44 UTC
[cxf] branch 3.4.x-fixes updated (d6a115e342 -> 139cf0282a)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from d6a115e342 Updating Tika to 1.28.4
new 35e4a546c9 Update Netty to 4.1.78.Final
new 139cf0282a 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] 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 35e4a546c9dff8476264e9293cc7224280cd4c05
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
(cherry picked from commit dd7f4a939ecd7b1a642c4f705a3c3d0e19ba20a6)
---
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 da481cbb82..88366a9b83 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.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>1.28.4</cxf.tika.version>
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 162806ee82..4cf6d61f35 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 e5d9fbbce3..58d1f67f8b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,7 +178,7 @@
<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.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.oauth.version>20100527</cxf.oauth.version>
<cxf.olingo.version>2.0.11</cxf.olingo.version>
[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 139cf0282a99d57d9a4730bbbf087344212d6d0a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 23 22:29:53 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6486adf264..25794d70f1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -126,6 +126,7 @@ B dc2b6cc5cc1164f6bb45049bec2373032411f54a
B df1c14e0f6d2246177c9f01762e19107e79c4393
B df47e19340ab59dd9eaebac340d89f18e44ef134
B dfbc4575f45fb22d4a7417914f87ea585e64d6b1
+B e441840c0212b8559ad406595fa4174a29124652
B e7f7b2154ed9f5668a62a7e99f862ca1aef7cd43
B e85178929cac18f07e72b67bbc17ec34f0a517a6
B ebcb82036cd653ff1c29abff2da57c8af8fb53f8
@@ -165,6 +166,7 @@ M 10ed47496475d88f098a6d8b1a41adf302b763cb
M 113be698b23b9fa2bf1b09847278ddca3638d601
M 12873b9257b5de85f819346ab2325738e3f80206
M 12a70c867e88379c520c64882ca2b261b9e9559d
+M 12efebccb444720603437f07fb87d41e419b5591
M 138aa4d6685f4d833c040c1a7f92ac86cbe49a6a
M 148f59425afbe5c95786d5f65912cd7c3c1fcc9c
M 15185954d24578b3a848afe5bf258d9774ff03b6
@@ -403,6 +405,7 @@ M d8eb0627ec5e878ef58e16b387a36c4cf3d1457c
M da9b167cd2c4c988e31f1b8e3f4f9ab06b5708dd
M dd08a4a9649c33226f56570cb0394bcf62a28fba
M dd5db1155870c2f5df684d1a0f77e7c0909ee7c5
+M dd7f4a939ecd7b1a642c4f705a3c3d0e19ba20a6
M dd9e67bef536068ce3956b9b94e380e780e78ee8
M ddc96849ddf45bde462497aac9150eace164c7ef
M dff229c0f97a9847310df16abefe8076ad8bfccd