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:18:47 UTC
[cxf] branch 3.6.x-fixes updated (b5faf57b6f -> 21bf42d906)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from b5faf57b6f Update Spring Boot to 2.7.1
new ba58c444dd Update Netty to 4.1.78.Final
new 21bf42d906 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 | 7 +++++++
distribution/src/main/release/samples/pom.xml | 4 +---
osgi/karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 2 +-
4 files changed, 11 insertions(+), 4 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 21bf42d906765fffb015f86d49e7b535d927bc56
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 23 19:08:47 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 870e8bfc49..2c2b53eaab 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -15,13 +15,18 @@ B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b
B cfca13411eb72d2d07ca243e24ced6e9743e6124
B cfe9f430ee617552eb743140cb78cc5df4c4eb83
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
+M 079d7ecbdaa87dcb6dbcff530595f128fe6e7519
M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
M 2afed183de17550a2a57d266ca4ad666ed1edbf0
M 309cfbf5710dab302eb4a611ac34dc288d1d8203
+M 34552752819b0bad272fcb67537c8df1b4c1ba3c
+M 4356da0295b57336c96f4d41b3b259eea0c51f8f
+M 461728895638c4d9bb3718d322b8816d32e267c6
M 60e202dde133752bdf2de35bb8b0ca3dda6113fa
M 7501891ee05153ba43eab3cdadccf789dd15de1e
+M 797df326d9b73cdaa02851a9cdc7d07bc05aad2c
M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
M a903a5392b3cd2b5925c6afa46f289b3b94a694a
@@ -29,7 +34,9 @@ M a9a32266a14c3956186a63e408d8d75c2f47bb0f
M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730
M b207c718e84bed8120bb114f1d79f575094c3a14
M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
+M ca46bebe06bc2732907e476bfe6116f09fbe1eb4
M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3
M d849512da6499d00e3e84eb60733a0343a473b44
+M e4d5c200a8e2b4df6c05c3ac6306e5d6384b81dc
M ec6d7253edf1f33decd2c2accefc98fa3bb8dc60
M fd261453cf08ac22d2c5be3c2fe4100438c740a5
[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ba58c444dd835e105136b9eab74e5c0e9e80914b
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
---
distribution/src/main/release/samples/pom.xml | 4 +---
osgi/karaf/features/src/main/resources/features.xml | 2 ++
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index fa6f367f06..dbddc01f58 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -31,9 +31,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.7.1</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 25dda519ed..55d3c642f6 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -181,6 +181,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>
@@ -193,6 +194,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 a3ac9e5039..66deef16af 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -175,7 +175,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>