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/10/13 19:32:52 UTC

[cxf] branch 3.4.x-fixes updated (dc52857bbf -> 37be7559e8)

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 dc52857bbf Recording .gitmergeinfo Changes
     new d715a4f46f Update Netty to 4.1.84.Final
     new 37be7559e8 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                                 | 2 ++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 4 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 37be7559e85423dde20c4ff9ed4ce69b06c9d8be
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Oct 13 15:32:30 2022 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5e87175b8b..151d52f35f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -166,6 +166,7 @@ B c44c39b2faed4eef057a68e38fbe743609cb6a4c
 B c58d2cd38003a90608aa04e40756c042cbaf7e03
 B c74d170998f0dab4a8e40be586dfb2197ed63f7a
 B cb0ab2cb818ed41e4790715ec8aaf982e256cf1f
+B cc5f16b03dcd316a92de4c937497ac6f38c9719d
 B cdd752fbc49a055f8e0e47893686af6ac70e7186
 B ce2528639b1caf8dffc5d93fa26156481f003f2c
 B cf9d1b6cd0696a1be6bcfcc99ee7a4676d4d7e41
@@ -545,5 +546,6 @@ M f2c3963682e6ff13ebe75bb21f725aaeac4d33d5
 M f7300e4a3df847c567376734579de7a240ac4111
 M f8b2df911055acc776c9b7d64fe3ed529858d507
 M fb7821164ec6d7fb98dc3f8caea67465db230a14
+M fb84ce2f105810a0df0f2deba139a0c7d15e6e4f
 M fcafcae2809e728c46164119af2e9976889a65d2
 M ff28b09782aba5a40828f31624bb30f6cce52814


[cxf] 01/02: Update Netty to 4.1.84.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 d715a4f46f2928b9a66b2c791d39443fa84f950b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Oct 13 13:35:11 2022 -0400

    Update Netty to 4.1.84.Final
    
    (cherry picked from commit 654444433f3b17123cbc00fd17ea1c10d7de7a9c)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit c9b0768cafe58d756dc9d38d1cf703fbd7f21c04)
    (cherry picked from commit fb84ce2f105810a0df0f2deba139a0c7d15e6e4f)
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index d164b1cb14..453ec2d735 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.49.v20220914</cxf.jetty9.version>
-        <cxf.netty.version>4.1.82.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.84.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>4.14.2</cxf.swagger.ui.version>
         <cxf.tika.version>1.28.5</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 0f6a34522d..9b2952ff30 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.82.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.84.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>