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:38:16 UTC
[cxf] branch 3.4.x-fixes updated (a2e28f059e -> 0922502d0a)
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 a2e28f059e Recording .gitmergeinfo Changes
new 4400aabb12 Update Zipkin to 2.23.19
new 0922502d0a 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 | 2 ++
parent/pom.xml | 2 +-
2 files changed, 3 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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0922502d0a1fd012cc2f0e562b8a819a9e08e8bf
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 29 09:29:54 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index afdbd0287f..3109e0f265 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -29,6 +29,7 @@ B 1b5c307b2f4cb375f436c9c1f406e099a15ef317
B 1b6adcb32f93d708d817cabf2cc63973fbc069de
B 1cb2a5fe44e390cf2106b07d8b6a8b5fffcda3e7
B 1cc69bd3ae56bcb514d706d876f9b97135253d34
+B 1f50286782f1b005d857a858af05555017e8e29a
B 237c71cbdc26cbc6e346c8cc592bd17ac892910e
B 24cdfa9312f878a14ad1ac19b4c9750ae3d8e60e
B 25ba7358dd56f2827bc2f48098d4e315e6f1baea
@@ -534,6 +535,7 @@ M e32cfd0329f1e0405f8b46395dbeac5c1c70dd6d
M e3bac521f80ebca0fa734d44e49310b1d1d7315f
M e474ee7d98eb782d1729c1e363ec91706c346069
M e47b201c3032f64082e9173c0f02d54698388c06
+M e4a6e75dbb1fe77b1da01572b897d0f3677a1ed7
M e516a32d1279a0da17c405dbf78b71e3303c2e0d
M e607d5c197aaa07ae213aa129e7bc09003c8804c
M e671095fbb2576e6e5a01d860951c3aa84968c80
[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4400aabb12033b1fa80c8bacb6ecef0f546fd316
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)
(cherry picked from commit e4a6e75dbb1fe77b1da01572b897d0f3677a1ed7)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1deb82fbdc..f390a6f8de 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -90,7 +90,7 @@
<cxf.bcprov.version>1.69</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>