[camel-karaf] branch main updated: Inherit opentelemetry-semconv version property from camel-dependencies parent

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 5f50a36  Inherit opentelemetry-semconv version property from 
camel-dependencies parent
5f50a36 is described below

commit 5f50a3617c32d2ee13b3d5c59d4671c474ac2bb8
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Jun 8 15:19:33 2021 +0100

    Inherit opentelemetry-semconv version property from camel-dependencies 
parent
---
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 pom.xml                                                  | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 9d4c647..0b79dcb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1652,7 +1652,7 @@
     <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/${opentelemetry-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-semconv/${opentelemetry-semconv-version}</bundle>
+    <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-semconv/${opentelemetry-alpha-version}</bundle>
     
<bundle>mvn:org.apache.camel/camel-opentelemetry/${project.version}</bundle>
   </feature>
   <feature name='camel-paho' version='${project.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index 6388a61..3348725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,6 @@
         <olingo2-gson-version>2.4</olingo2-gson-version>
         <ognl-bundle-version>3.1.12_1</ognl-bundle-version>
         <opencensus-api-version>0.24.0</opencensus-api-version>
-        
<opentelemetry-semconv-version>0.15.0-alpha</opentelemetry-semconv-version>
         <oncrpc-version>1.1.3</oncrpc-version>
         <ops4j-base-version>1.5.0</ops4j-base-version>
         <oro-bundle-version>2.0.8_6</oro-bundle-version>