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/07/12 18:26:21 UTC

[cxf] branch 3.6.x-fixes updated (a95d8494cb -> 6c4eae9ec9)

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 a95d8494cb Downgraded TestNG to 6.14.3 and updated Arquillian to 1.6.0.Final
     new 76dea67a28 Update Netty to 4.1.79.Final
     new 6c4eae9ec9 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 +
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


[cxf] 01/02: Update Netty to 4.1.79.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 76dea67a28d5879e807e03e2830fe6abfc46d7d2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 12 12:53:48 2022 -0400

    Update Netty to 4.1.79.Final
    
    (cherry picked from commit a54e2dbe6e4dc2d74472e2db523a5290378da325)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
---
 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 0593ccf935..5646c14bf4 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.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.78.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.79.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/parent/pom.xml b/parent/pom.xml
index bcbd9f9e44..64110a14e4 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.78.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.79.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>


[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 6c4eae9ec9f00826b88dbcdb475b9ac67e082f4c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 12 14:21:28 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a55c4ac276..778d83df9f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -37,6 +37,7 @@ M 8cba83cdbb6a1b0d28f6fd7e218b342a42305963
 M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
 M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158
 M 9c3dc283369f6c829b040920cbb93002daf3d440
+M a54e2dbe6e4dc2d74472e2db523a5290378da325
 M a79b210719d6b0388dc56761b12c609d4d5f6a8a
 M a903a5392b3cd2b5925c6afa46f289b3b94a694a
 M a9a32266a14c3956186a63e408d8d75c2f47bb0f