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 2021/09/11 00:50:46 UTC

[cxf] branch 3.3.x-fixes updated (0a89624 -> 986a5dc)

This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 0a89624  Recording .gitmergeinfo Changes
     new 2201cf4  Update Netty to 4.1.68.Final (#848)
     new 986a5dc  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 +++
 parent/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

[cxf] 01/02: Update Netty to 4.1.68.Final (#848)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 2201cf488c6f6dc4a965a173b38fa85360b4fb41
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Sep 10 17:28:47 2021 -0400

    Update Netty to 4.1.68.Final (#848)
    
    (cherry picked from commit 3bee95db57ddac116e57e2fba50e9f0628c56e56)
    (cherry picked from commit 871c816db8350996560b7bd6c36dd1e9bbc5f4f4)
    
    # Conflicts:
    #	parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 6da4817..624931d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -169,7 +169,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.65.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.68.Final</cxf.netty.version>
         <cxf.oauth.version>20100527</cxf.oauth.version>
         <cxf.olingo.version>2.0.11</cxf.olingo.version>
         <cxf.openjpa.version>3.1.2</cxf.openjpa.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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 986a5dcec23be5894b1993e10237aa231092b66f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Sep 10 20:50:27 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a33a736..22f2ea7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -224,6 +224,7 @@ B 51417a1665d065a7135ade76423c0c5867b142bb
 B 515b2145be90f1ad91bd239274352f40a2af2799
 B 517b88cb2c293115e0dce1c1105f448e9dc21164
 B 52041977ecdb28ee161eb73379858e6078a1bfec
+B 5227a25eb8283a51052cf0f70eeebfd8cc3af937
 B 52edc68ce786ae42accb285570c545438be9cee7
 B 540e471660ed79cb88771f6c9a0022cbede241ac
 B 54e2708678fd9b0e2abdd83cbfb98cb37ec893dc
@@ -848,6 +849,7 @@ M 67b40fba212ac9a72de6dba2b31eb235b1ce3d71
 M 68bb7cf9074c96c8e71f843c90f1d948ac45c2bf
 M 69b805a97fa96716c8f76278e577ba122c2727e2
 M 69e31b9bbde9b6662989868cb600b545ba379b97
+M 6a4e41b34af91dd2409cd511e852c27e4eeac193
 M 6a77819f4bc141fcddd53a36b178972f1f68fe97
 M 6b7e50b87d74dc6b7d1e830b373c7e30c04e14a2
 M 6b8368ba32ded81492d258940f447845f84bc474
@@ -892,6 +894,7 @@ M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
 M 85225069fe57849cbfac1b039014ce195a1d3bb5
 M 8532499404623bd531147ee314ec65544cab34de
 M 861c6ae9e63ba01cd5f6ae398a83a2d09a1b1364
+M 871c816db8350996560b7bd6c36dd1e9bbc5f4f4
 M 8751a7c9e70b23a48e6048de5d75e113218adf94
 M 8798b83cef186439b72ff02d9bafa37f9658404e
 M 88907f141ee80792627da3cc7846d1562f6c0238