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 12:32:34 UTC
[cxf] branch 3.6.x-fixes updated (f4231a3f22 -> 7fc2a0262c)
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 f4231a3f22 Recording .gitmergeinfo Changes
new 877b2520ee Update Zipkin to 2.23.19
new 7fc2a0262c 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 +
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[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 7fc2a0262cff6e667acf7aca10ee1158138033bb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 08:32:14 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index e026c98b61..305f5611da 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -42,6 +42,7 @@ M 08f9a8e455896e005c508ab376a55d8edc2cc168
M 0e863bb147452ad3819c4ca8456ca8afc46d6b16
M 106c310b39a5b611cd8b8c2de4b4070e1d52b498
M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
+M 115ae80d516ff6bce8bf12e073cbc0cfc6ed03da
M 11e88c7b208765b64a4dac129f37d0f9114ec05e
M 120dd13bdf46dc70f93dd4908711d522454a5492
M 12817b13d75f2663a5dd5677196c2d5618af7476
[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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 877b2520eef503d9d8e384b0a0b2cb5cc659abd7
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
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ecdce03e8..8e418f1610 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,7 +88,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>