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 2023/01/17 20:19:48 UTC

[cxf] branch 3.4.x-fixes updated (a1fd204fd8 -> d8ce64b3e2)

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

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


    from a1fd204fd8 Fixing corba / jaxws / ws-addr / ws-security tests (result of EasyMock 5.1.0 update)
     new 323218b63e Update Apache Tomcat to 9.0.71
     new d8ce64b3e2 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 +++++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)


[cxf] 01/02: Update Apache Tomcat to 9.0.71

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

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

commit 323218b63e07e49bc987449cb9a908e17dc3bbcc
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Jan 16 20:02:10 2023 -0500

    Update Apache Tomcat to 9.0.71
    
    (cherry picked from commit f50fd2ee733928a565bf98ead200780732ef03fe)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit dcb99be1b3c253b21d191d6d382631396c5c39bf)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       parent/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 33d6741e05..f487f45c79 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -37,7 +37,7 @@
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
         <cxf.tika.version>1.28.5</cxf.tika.version>
-        <cxf.tomcat.version>9.0.70</cxf.tomcat.version>
+        <cxf.tomcat.version>9.0.71</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
     </properties>
     <dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index a0d0b08801..51646faa95 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -217,7 +217,7 @@
         <cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
         <cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
         <cxf.tika.version>1.28.5</cxf.tika.version>
-        <cxf.tomcat.version>9.0.70</cxf.tomcat.version>
+        <cxf.tomcat.version>9.0.71</cxf.tomcat.version>
         <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] 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit d8ce64b3e29fd29e9cbbb3669be51085d6b0e76d
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jan 17 14:47:30 2023 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 6508cfc721..03d36c830d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -181,6 +181,7 @@ B b19a2308889e259caa19052e35954be756e3efe1
 B b1a2bf99157712023aada0aa1c8ded40eaefc92a
 B b26d5773caf507fc18abf82097805b75a8ff607e
 B b341f7cd05a5130f53efd56c01d14136655afe35
+B b469420e2b4b62a5a8a57a2e2305cb0b19ed9eee
 B b729ec906ab4391e33152d0a9223506555a3c384
 B b756a926aad920c977c16fe6df469630b189d1b6
 B b88bbda9b0ebd41af1f00909e553c92055d9cfa5
@@ -249,6 +250,7 @@ B f5f74be6d1a864bd73f925a24ed6ca4ecb020f3b
 B f87280dac04a2738c6cb42e83ff7654363a979a7
 B f93a0cea91c19c41338d96899a69bb66c463e9ff
 B fab90409cb5ac67b04fe80039870972d758b8349
+B faba2ac4fb90ec96b79c693aa4491622ed2ae010
 B fb02ed59d270bbd78fc6b931bbbaacd1dc0c42ec
 B fbb800f42004bbf1415b8762d43057ce70b32555
 B fbfb16b5344e415437ad73dc709c51c60755f430
@@ -287,6 +289,7 @@ M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
 M 19226671095cee205e63629f5c48d450f45cf32f
 M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
 M 196f87904f7148b76d348874bf69c42a28f5e262
+M 19fbed8a77a99646b58927c53c8e21057881370f
 M 1a999f377c2c54c57df12f743d01b7e5eaecf7d1
 M 1b48b239be3807e843c56939f663ae935a53f6f5
 M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
@@ -474,6 +477,7 @@ M 965e1bb9e9658f4024f33bf832308f8b8dfce4b6
 M 9661dcee07f9870b7752cc855e6e0fce488572f3
 M 971e7d7fba98cf4aabd62477b9160aeebd5d261c
 M 975fc9e2fe226ddb8dfa845bd9565839c7391e2a
+M 97ca379472a8c6f3f766d446f1c7cdb0f0e94ca2
 M 9980b0472524e1010aaf7a4a3fe5ff072270efe3
 M 9aabdf3e8a4b9b808cfea5487b86b7e0eb6d5ebb
 M 9ae3cb225f28fa89347202712307518a10b7d658
@@ -532,6 +536,7 @@ M b8a2f139f8a4f80a90ef49c2a0757395cb303be6
 M b909e6dd478272d2c3e094922801a201ef94eeb5
 M ba463164bbc34192ee24e756f615a8bd3f15a75c
 M bb73cfaaebea3c74025c51da7b6478b91122a245
+M bb8b2ccfddb26d28f3bb95267e9c93d39843cfca
 M bc03476635143bc867908996e6cf572b9340d786
 M bc5b52650de305e705aafeb482ccef9d369ab848
 M bc5d02a1823de215646508b22976358b1905adab
@@ -590,11 +595,13 @@ M d8eb0627ec5e878ef58e16b387a36c4cf3d1457c
 M d9176f4cffba64cad32fa2bdefb275f5d976c46b
 M da9b167cd2c4c988e31f1b8e3f4f9ab06b5708dd
 M dc40395d5a5a0f873f6321b25ad6a89ead96419c
+M dcb99be1b3c253b21d191d6d382631396c5c39bf
 M dd08a4a9649c33226f56570cb0394bcf62a28fba
 M dd5db1155870c2f5df684d1a0f77e7c0909ee7c5
 M dd7f4a939ecd7b1a642c4f705a3c3d0e19ba20a6
 M dd9e67bef536068ce3956b9b94e380e780e78ee8
 M ddc96849ddf45bde462497aac9150eace164c7ef
+M de8507b0d37df26f6f3479d2972991209762b51f
 M df74e601dccf058834883f9c15c294d5b7a102d8
 M dff229c0f97a9847310df16abefe8076ad8bfccd
 M dff93aa931d7c4d671c458f63f450c0a4d5fea3f