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/05 15:03:22 UTC

[cxf] branch 3.6.x-fixes updated (5ee153623c -> 8311c0ea97)

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 5ee153623c CXF-8730: Fix org.apache.cxf.osgi.itests.jaxrs.JaxRsServiceTest (#967)
     new 719c96a310 Update maven-enforcer-plugin to 3.1.0
     new 43cfb702ca Update Undertow to 2.2.18.Final
     new 8311c0ea97 Recording .gitmergeinfo Changes

The 3 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  | 4 ++++
 parent/pom.xml | 2 +-
 pom.xml        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)


[cxf] 03/03: 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 8311c0ea9783697307e616bd4c3f669e8396eab3
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 10:56:57 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9452523f35..504c386081 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -19,6 +19,7 @@ M 079d7ecbdaa87dcb6dbcff530595f128fe6e7519
 M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
 M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
+M 227e81b07f547106af5e76af7e526fc6c3c8ffc2
 M 2afed183de17550a2a57d266ca4ad666ed1edbf0
 M 309cfbf5710dab302eb4a611ac34dc288d1d8203
 M 333873a41b8fd7bd380692459ae1b42f14ff6c0a
@@ -34,6 +35,7 @@ M a903a5392b3cd2b5925c6afa46f289b3b94a694a
 M a9a32266a14c3956186a63e408d8d75c2f47bb0f
 M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730
 M b207c718e84bed8120bb114f1d79f575094c3a14
+M b6e3ab83a37cfb777d6eebf9711e552027bde37a
 M c5b7db5a4cceb3df6094ee38215725fd4ecc2b8c
 M ca46bebe06bc2732907e476bfe6116f09fbe1eb4
 M d26294e7f6a011101ec76bc707255899b7539755
@@ -41,4 +43,6 @@ M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3
 M d849512da6499d00e3e84eb60733a0343a473b44
 M e4d5c200a8e2b4df6c05c3ac6306e5d6384b81dc
 M ec6d7253edf1f33decd2c2accefc98fa3bb8dc60
+M f48dc57d5bb4a8848f3b4f9ef5cedcfd9d8ab1b7
+M f72118971428a059b94f3ee4c0730c95d5f1c192
 M fd261453cf08ac22d2c5be3c2fe4100438c740a5


[cxf] 01/03: Update maven-enforcer-plugin to 3.1.0

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 719c96a310c0afa62d430588cf38e77523080fa2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 29 17:10:47 2022 -0400

    Update maven-enforcer-plugin to 3.1.0
    
    (cherry picked from commit 99049ddfca6a3dc00d820ec343515ee8b66160b7)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8d4546231a..e81eda2c11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -639,7 +639,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                     <configuration>
                         <rules>
                             <requireJavaVersion>


[cxf] 02/03: Update Undertow to 2.2.18.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 43cfb702cae5b90c93cabe769854df2b284e1879
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jul 5 09:54:59 2022 -0400

    Update Undertow to 2.2.18.Final
    
    (cherry picked from commit b6e3ab83a37cfb777d6eebf9711e552027bde37a)
    
    # 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 3069b5483f..6a814630f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,7 @@
         <cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
         <cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>
         <cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>
-        <cxf.undertow.version>2.2.12.Final</cxf.undertow.version>
+        <cxf.undertow.version>2.2.18.Final</cxf.undertow.version>
         <!-- the Export-Package is the same as the Maven artifact
              version (with the Final), but we don't want an import package with a version
              with a qualifier. We do want a range. -->