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/11/04 21:05:24 UTC

[cxf] branch 3.3.x-fixes updated (6bc2c82 -> a0d31e8)

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 6bc2c82  CXF-8610:Add null check to IOUtils to avoid null CCL (#867)
     new 580054a  Update Netty to 4.1.70.Final
     new a0d31e8  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 +++++++
 parent/pom.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

[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 a0d31e812b512bbd70d23fd187efc2d306ad00a0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 4 17:02:55 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 294ad68..d54907c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -129,6 +129,7 @@ B 2ad573058cc7e85c089a84b0d9eb310e991528bb
 B 2b03e6b82c90839f447f3531f0a573a08652e13b
 B 2bd5324d6d09e35345af4013bb5f4f07113b03d2
 B 2cff3ce96abb43a5171d047984a47a37c1c2ea68
+B 2d065f32c8aae68b4af8f99f098caab1541b1b5c
 B 2d159906f9b9fd756a4a94053b360552a679cf9d
 B 2d2785078a4ee1133d81b932d4f68e0adfa78077
 B 2d2e3846b04fa64ca25e61900b478b429778c479
@@ -354,6 +355,7 @@ B 7bd83910c06e30fb780164b9b86a6cd45eb3212c
 B 7d163dd06edafe6f86707970f6e31d3d6d2d2cdb
 B 7d559ec87e45c9c5d8073b5b2887d8919f54a88d
 B 7d815ff8be6562d12f7981c9c3e1caafd892a581
+B 7ea3db6a204ca8099bc9ce4cc099b24f98382810
 B 7eba3a3c1b688b1b9de6d52dcee1ba9957f4d7eb
 B 7f00907652eadf61628b13e673a84df4804dc067
 B 7f20ddfabf5b2ed4c84b1ae6a1cac715f8d6b076
@@ -751,6 +753,7 @@ M 04fe61b2a9931d23eaad336192fe2c3dc429c2aa
 M 061104df8a9435ea618b1cba9f78b76793a7db57
 M 067f1afd5e29c0b6601a6df0e44862f52e548476
 M 07c15ddcbbc8c9443d3ca2ef296bceda28fb24f3
+M 08d05f5005581b397f90b7b052f0377509a5caff
 M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
 M 0ac822f9f66e8f721c4668bf8ccd42a2b37d5eb8
 M 0b69090f97e262d8c107d82781dcba49fa15626d
@@ -863,6 +866,7 @@ M 523d6cc11b0e0d50d9b889bed09091d15c2e070a
 M 528b35178ec31860cf5ad2095d6f3cc3c951d914
 M 535f75e575f151634316fb0bb19c28faee2b257c
 M 54a009938cfdfac65a04c849cf2268d8be9899b7
+M 54ecc5e5686ab26a233d64ba17f8bf6360227732
 M 55abc6f8416fd81f26627fa42a37f903f9ef7965
 M 56e962c295f48e9f48dbd0884df79e5e48601284
 M 589e321622b72ae57fab910d76b3e4fb0c160979
@@ -921,6 +925,7 @@ M 7aa6e0a402b8ce7dfff8a931a507b884d7152cea
 M 7b50181ebc445bb84d3463b284643432399bc0f8
 M 7c6bf1a843f2d4860d1bd7541139911ad47c7964
 M 7c6c2ed277fc678d8c2485a8e661cb44eb6a4d11
+M 7ce2fd8dc57ff230af1e200a2d4cdd3357724766
 M 7cfc8d07e1175c35877e7368f020db0749a78fab
 M 7da863a6c524aae01d18d6fab78f789e6ba85bf0
 M 7e1bc67acf02fe6049a4bfb7e13fe6933e618ae8
@@ -1027,6 +1032,7 @@ M c42eec4b0ead390f3e02eb4f1d50cdd4af640fe0
 M c5a94eae1cf29b81562cca7baac5c7658201d14d
 M c673affb1cc40a38953dd9ce6b567705fa6eef46
 M c8aaac48cfa00185d184f17d07e5caf78b466eb4
+M ca9bd0dad7228e8fe3d36c3f3f23900390a79d66
 M cafe51572ed0a0c1452ea0685b1c750fb0df6755
 M cbc0fde7f85d01e379e40a7f27fe5cea20169ddf
 M cbeb9a21ba4a46f1861851f5bc56ee90d89a2225
@@ -1068,6 +1074,7 @@ M e2210a3520f39ba2262fa6934b26bd0cd8737e67
 M e36d407354defa65587a5e291f808bd65f4f43df
 M e38fc4aa14d7741369de5d027b30e52def3a0549
 M e4cc2f2327862d5354c60c6773bc88585a200675
+M e5f1bdf5946ef2c45f0b770a84775eb7896364f1
 M e72ad770c9a8f4439b93e2c19e61c43562ac5877
 M eb4bab9983a287bf9dc0574d22077cc783bc88ac
 M edd100917a2f73e43d6e9e34efdc09a854f5c942

[cxf] 01/02: Update Netty to 4.1.70.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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 580054ac81a488a2e6fc934658ba47b1ad780a75
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Nov 4 09:32:46 2021 -0400

    Update Netty to 4.1.70.Final
    
    (cherry picked from commit dd5db1155870c2f5df684d1a0f77e7c0909ee7c5)
    
    # Conflicts:
    #	parent/pom.xml
    (cherry picked from commit e5f1bdf5946ef2c45f0b770a84775eb7896364f1)
    
    # 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 1cb0c60..862ae71 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.68.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.70.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>