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 2020/10/09 00:35:55 UTC
[cxf] 01/02: Updating to latest Brave 5.12.6 / Brave Reporter 2.15.2
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 82ddde6ca09a1678efc6b954c0ea9ddfae81689c
Author: reta <dr...@gmail.com>
AuthorDate: Sun Sep 13 22:46:19 2020 -0400
Updating to latest Brave 5.12.6 / Brave Reporter 2.15.2
(cherry picked from commit de540657667d3e787a41c1e34d045eb4b37b183e)
# Conflicts:
# parent/pom.xml
---
osgi/karaf/features/src/main/resources/features.xml | 1 +
parent/pom.xml | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 1baead1..5826a0b 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -297,6 +297,7 @@
<feature version="${project.version}">cxf-core</feature>
<bundle start-level="35">mvn:io.zipkin.zipkin2/zipkin/${cxf.brave.zipkin.version}</bundle>
<bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter/${cxf.brave.reporter.version}</bundle>
+ <bundle start-level="35">mvn:io.zipkin.reporter2/zipkin-reporter-brave/${cxf.brave.reporter.version}</bundle>
<bundle start-level="35">mvn:io.zipkin.brave/brave/${cxf.brave.version}</bundle>
<bundle start-level="35">mvn:io.zipkin.brave/brave-instrumentation-http/${cxf.brave.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-brave/${project.version}</bundle>
diff --git a/parent/pom.xml b/parent/pom.xml
index c5f60e7..c7e0316 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,9 +88,9 @@
<cxf.atmosphere.version.range>[2.4,3.0)</cxf.atmosphere.version.range>
<cxf.atmosphere.version>2.5.15</cxf.atmosphere.version>
<cxf.bcprov.version>1.66</cxf.bcprov.version>
- <cxf.brave.reporter.version>2.12.1</cxf.brave.reporter.version>
- <cxf.brave.version>5.10.1</cxf.brave.version>
- <cxf.brave.zipkin.version>2.19.3</cxf.brave.zipkin.version>
+ <cxf.brave.reporter.version>2.15.2</cxf.brave.reporter.version>
+ <cxf.brave.version>5.12.6</cxf.brave.version>
+ <cxf.brave.zipkin.version>2.21.7</cxf.brave.zipkin.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
<cxf.cdi.api.version>1.2</cxf.cdi.api.version>
<cxf.classgraph.version>4.6.32</cxf.classgraph.version>