Fix dependency convergence error io.opentelemetry:opentelemetry-semconv
Fixes #7298
diff --git a/pom.xml b/pom.xml
index dbbdc14..2d226c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,7 @@
<okhttp.version>4.12.0</okhttp.version>
<okio.version>3.6.0</okio.version><!-- @sync com.squareup.okhttp3:okhttp:${okhttp.version} dep:com.squareup.okio:okio-->
<opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client -->
+ <opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!-- Alignment for camel-opentelemetry and google-pubsub -->
<org.json.version>20240303</org.json.version><!-- Used by amazon-kinesis-client, google-cloud-bigquery and com.ibm.mq.jakarta.client -->
<perfmark-api.version>0.27.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api -->
<re2j.version>1.7</re2j.version><!-- Used by google-cloud-pubsub and amazon-kinesis-client -->
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index e40a55e..7c008ab 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6971,6 +6971,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>${opentelemetry-semconv-legacy.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
<version>${perfmark-api.version}</version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index c822bd1..5143fa3 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6884,6 +6884,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>io.opentelemetry</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>opentelemetry-semconv</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.29.0-alpha</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
<groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.27.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -23550,11 +23555,6 @@
<version>1.23.0-alpha</version><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
</dependency>
<dependency>
- <groupId>io.opentelemetry</groupId><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
- <artifactId>opentelemetry-semconv</artifactId><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
- <version>1.23.0-alpha</version><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
- </dependency>
- <dependency>
<groupId>io.opentracing.contrib</groupId><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
<artifactId>opentracing-jdbc</artifactId><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
<version>0.2.4</version><!-- io.quarkus:quarkus-bom:3.0.0.Final -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 98ae4ab..c6311ad 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6849,6 +6849,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>io.opentelemetry</groupId>
+ <artifactId>opentelemetry-semconv</artifactId>
+ <version>1.29.0-alpha</version>
+ </dependency>
+ <dependency>
<groupId>io.perfmark</groupId>
<artifactId>perfmark-api</artifactId>
<version>0.27.0</version>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index e346604..96f8d7f 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6849,6 +6849,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>io.opentelemetry</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>opentelemetry-semconv</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.29.0-alpha</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </dependency>
+ <dependency>
<groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>0.27.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
