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/17 13:44:18 UTC

[cxf] branch 3.6.x-fixes updated (2389293b3f -> 798e171a42)

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 2389293b3f Update Project Reactor to 3.4.21
     new b84d943305 Update Jaeger Java Client to 1.8.1
     new 798e171a42 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 Jaeger Java Client to 1.8.1

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 b84d943305f380867cc85a63f2226d4d827be3ed
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jul 17 09:40:55 2022 -0400

    Update Jaeger Java Client to 1.8.1
    
    (cherry picked from commit 1e4658323353b57ab3b7f07bc0ac1951256b8ac7)
    
    # 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 8b9e164d85..5d8d68d182 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -130,7 +130,7 @@
         <cxf.jackson.version>2.13.3</cxf.jackson.version>
         <cxf.jackson.databind.version>2.13.3</cxf.jackson.databind.version>
         <cxf.jacorb.version>3.9</cxf.jacorb.version>
-        <cxf.jaeger.version>1.8.0</cxf.jaeger.version>
+        <cxf.jaeger.version>1.8.1</cxf.jaeger.version>
         <cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version>
         <cxf.jakarta.injectapi.version>1.0.3</cxf.jakarta.injectapi.version>
         <cxf.jakarta.jwsapi.version>2.1.0</cxf.jakarta.jwsapi.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 798e171a429c118eaa6c5d0a744b5fb1f1afc654
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Jul 17 09:43:58 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 778d83df9f..13af1d7979 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -18,10 +18,13 @@ B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
 B ff995172b7a80ea31c9e944011dce331dc138a29
 M 079d7ecbdaa87dcb6dbcff530595f128fe6e7519
 M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
+M 1654e0d45ac3ccaaa7eb53cc9ede8331424cf2fc
 M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
 M 1a434023d792e352785e0be73815560fcae1efe4
+M 1e4658323353b57ab3b7f07bc0ac1951256b8ac7
 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
 M 227e81b07f547106af5e76af7e526fc6c3c8ffc2
+M 2ad9d0b2eef17c0d57d3cb96f3b2cecd1e704869
 M 2afed183de17550a2a57d266ca4ad666ed1edbf0
 M 2c0b7979141a9536b178bf81106709182856d30a
 M 309cfbf5710dab302eb4a611ac34dc288d1d8203
@@ -43,6 +46,7 @@ M a903a5392b3cd2b5925c6afa46f289b3b94a694a
 M a9a32266a14c3956186a63e408d8d75c2f47bb0f
 M b15e3580e8f8692b2ffd51e6b2c44ce9dd8a5730
 M b207c718e84bed8120bb114f1d79f575094c3a14
+M b67138f8caece4c98e3c44437409d4be4d3801da
 M b6e3ab83a37cfb777d6eebf9711e552027bde37a
 M b9569dad4a4636af572b23414a9ee8a67c2daee6
 M bbf73a155bf4d87d824e00e54c269fb4e697468e