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/10/29 13:26:04 UTC

[cxf] branch 3.5.x-fixes updated (7d0819a956 -> 1f50286782)

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

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


    from 7d0819a956 Recording .gitmergeinfo Changes
     new e4a6e75dbb Update Zipkin to 2.23.19
     new 1f50286782 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  | 4 ++++
 parent/pom.xml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


[cxf] 01/02: Update Zipkin to 2.23.19

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

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

commit e4a6e75dbb1fe77b1da01572b897d0f3677a1ed7
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Oct 28 21:11:29 2022 -0400

    Update Zipkin to 2.23.19
    
    (cherry picked from commit 115ae80d516ff6bce8bf12e073cbc0cfc6ed03da)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit 877b2520eef503d9d8e384b0a0b2cb5cc659abd7)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e8cc512048..bd481e683e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,7 +90,7 @@
         <cxf.bcprov.version>1.70</cxf.bcprov.version>
         <cxf.brave.reporter.version>2.16.2</cxf.brave.reporter.version>
         <cxf.brave.version>5.14.1</cxf.brave.version>
-        <cxf.brave.zipkin.version>2.23.15</cxf.brave.zipkin.version>
+        <cxf.brave.zipkin.version>2.23.19</cxf.brave.zipkin.version>
         <cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
         <cxf.cdi.api.version>2.0.2</cxf.cdi.api.version>
         <cxf.classgraph.version>4.8.25</cxf.classgraph.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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 1f50286782f1b005d857a858af05555017e8e29a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 08:41:17 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2a48429edf..f5e588c455 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -29,6 +29,7 @@ B 798e171a429c118eaa6c5d0a744b5fb1f1afc654
 B 79a0f55fd7d26b27414199c7e653ed913a63e6d5
 B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
 B 7f683ba748e2133af0f93f1d77df5921b4e86011
+B 7fc2a0262cff6e667acf7aca10ee1158138033bb
 B 7fc2c4ca26c8615d1c231292dbcd96992e45b2a5
 B 7fd567e59b860dc59fcd221b8fb4aeeea95a3ef0
 B 8252a18d68b994129a6adbcfe1330f67020eb4f0
@@ -65,11 +66,13 @@ B e7c2aee206ae5084204502b4744feed5a8e93e04
 B ea0212e271a1df063cba57b80d658d78efe5eb1f
 B eb54ef785deb4d58def825feb9852ebe68b6b5b8
 B ef369f2efd144ac4fec2fac43e1805a794e777a6
+B f4231a3f22a3736eaf3235ef83268f9bc8051d77
 B fb4db130537c71d22dc912db98b9b31f7945db47
 M 069f602cb56f5164d8e926f5a0dd2a11b3caf004
 M 10c6232ee9af28bbea549433f5c6e64af470fc1d
 M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
 M 132c8fce376a2bb08de5917207cd28531d7e2aff
+M 13c592c7bc7b6861f644e937b3bed555d3ee836b
 M 15063b0f08c66011f24f2d32352200736ee83710
 M 157e2cbef796e9fc9c9ba5c5e79bd0cd7a46692e
 M 16307f3833422cd93e68a694df9a872b2b08bb43
@@ -82,6 +85,7 @@ M 2afed183de17550a2a57d266ca4ad666ed1edbf0
 M 2fda4dd66aba6ac290b9f3773e423c2bc5c61dcb
 M 309cfbf5710dab302eb4a611ac34dc288d1d8203
 M 310f93d91a00f4ab6297af2f574a0bfeda3e94f0
+M 36453932d815079572cd5d9ff14eec328bf49786
 M 38a09d0b606f5dc0aa3a477791af76fd6f1c0cb6
 M 3ba3ce8f7bd1a86d2063761bd7a8df323f98c448
 M 3d71fe88f5d9649f3b770598b5b170cb6bc8871f