You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2021/02/09 11:07:51 UTC

[cxf] branch 3.3.x-fixes updated (3dbc64b -> a8ea2dc)

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

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


    from 3dbc64b  Recording .gitmergeinfo Changes
     new 38386af  Updating Netty to 4.1.59.Final
     new a8ea2dc  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  | 1 +
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[cxf] 01/02: Updating Netty to 4.1.59.Final

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

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

commit 38386af7dd4e09b7d473114160255f1f80f4ea0f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Feb 9 07:00:41 2021 +0000

    Updating Netty to 4.1.59.Final
    
    (cherry picked from commit 81d82da19ed43bbeaae12a7eda052a64890ec970)
    
    # 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 ed15aef..d089f4d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -168,7 +168,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.50.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.59.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 co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a8ea2dc2e97b24ea2be6d1f818d0151daa3c4784
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Feb 9 09:42:52 2021 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 60b8c8b..09a2b83 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -598,6 +598,7 @@ M 7ef814556d727c147d6f625cbb1170edfd24a752
 M 7f733555945f1faed66b0b6163d24889d4cf60fc
 M 80c92d57ab7c34f59d51c3b30d0db9ab074e8c6b
 M 8100e4d9512b2fd9ce2fe30a4b7feeaab1d691a5
+M 81d82da19ed43bbeaae12a7eda052a64890ec970
 M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
 M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
 M 88907f141ee80792627da3cc7846d1562f6c0238