This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 504b82a opentelemetry-context-prop was merged with
opentelemetry-context on otel 0.11 (#53)
504b82a is described below
commit 504b82ab4b6a35b46df9acb1e42d2e1cf32232a4
Author: Ruben Vargas Palma <ruben.vp8...@gmail.com>
AuthorDate: Thu Nov 26 23:41:48 2020 -0600
opentelemetry-context-prop was merged with opentelemetry-context on otel
0.11 (#53)
Signed-off-by: Ruben Vargas <ruben.vp8...@gmail.com>
---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 670da06..7e85195 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1999,7 +1999,7 @@
<feature version='${project.version}'>camel-grpc</feature>
<bundle
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-api/${opentelemetry-version}</bundle>
<bundle
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-sdk/${opentelemetry-version}</bundle>
- <bundle
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-context-prop/${opentelemetry-version}</bundle>
+ <bundle
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-context/${opentelemetry-version}</bundle>
<bundle>mvn:org.apache.camel/camel-opentelemetry/${project.version}</bundle>
</feature>
<feature name='camel-paho' version='${project.version}' start-level='50'>
