This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.20.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e316f479ad9ca49a7beb4012da67ff3970c614ca
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed May 7 09:17:41 2025 +0100
Fix dependency convergence error io.opentelemetry:opentelemetry-semconv
Fixes #7298
---
pom.xml | 1 +
poms/bom/pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +++++
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +++++
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index dbbdc14691..2d226c7abb 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 e40a55ea13..7c008ab329 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6970,6 +6970,11 @@
</exclusion>
</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>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index c822bd13bd..5143fa3b6a 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6883,6 +6883,11 @@
</exclusion>
</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} -->
@@ -23549,11 +23554,6 @@
<artifactId>opentelemetry-sdk-logs-testing</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.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 -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 98ae4ab283..c6311ad8dc 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6848,6 +6848,11 @@
</exclusion>
</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>
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 e346604714..96f8d7f5b8 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6848,6 +6848,11 @@
</exclusion>
</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} -->
