This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch CXF-8671 in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f795843827228ac9254e6c76ece7c5ce64fe04e0 Merge: d3ffd9d8d9 f977e9ceca Author: Andriy Redko <[email protected]> AuthorDate: Sun Mar 31 09:41:55 2024 -0400 Merge remote-tracking branch 'origin/main' into CXF-8671 distribution/javadoc/pom.xml | 4 ++++ .../main/release/samples/jax_rs/tracing_micrometer/pom.xml | 4 ++++ .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++-- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++++ .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++-- .../samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 4 ++++ integration/tracing/tracing-opentelemetry/pom.xml | 4 ++++ .../opentelemetry/AbstractOpenTelemetryClientProvider.java | 12 +++++++----- .../tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 9 +++++---- parent/pom.xml | 9 +++++++-- .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +++++----- .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++--- 12 files changed, 51 insertions(+), 23 deletions(-) diff --cc parent/pom.xml index 1f284e308c,dc0b805dc1..e85647882a --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -193,11 -192,10 +193,11 @@@ <cxf.olingo.version>2.0.12</cxf.olingo.version> <cxf.openjpa.version>3.2.2</cxf.openjpa.version> <cxf.opentelemetry.version>1.34.1</cxf.opentelemetry.version> - <cxf.opentelemetry.semconv.version>1.23.1-alpha</cxf.opentelemetry.semconv.version> + <cxf.opentelemetry.semconv.version>1.24.0-alpha</cxf.opentelemetry.semconv.version> <cxf.opentracing.version>0.33.0</cxf.opentracing.version> <cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version> - <cxf.persistence-api.version>3.0.0</cxf.persistence-api.version> + <cxf.parsson.version>1.1.5</cxf.parsson.version> + <cxf.persistence-api.version>3.1.0</cxf.persistence-api.version> <cxf.plexus-archiver.version>4.9.2</cxf.plexus-archiver.version> <cxf.plexus-utils.version>3.5.1</cxf.plexus-utils.version> <cxf.reactivestreams.version>1.0.4</cxf.reactivestreams.version>
