[cxf] branch dependabot/maven/com.fasterxml.jackson.core-jackson-databind-2.15.3 created (now 0441c277eb)

2023-10-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/com.fasterxml.jackson.core-jackson-databind-2.15.3
in repository https://gitbox.apache.org/repos/asf/cxf.git


  at 0441c277eb Bump com.fasterxml.jackson.core:jackson-databind from 
2.15.2 to 2.15.3

No new revisions were added by this update.

[cxf] branch 3.6.x-fixes updated (00176dfb14 -> 8bd2379fe2)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 00176dfb14 Fix OSGi's HttpServiceTest integration tests
 new 274609cead Update Jenkins pipeline to use JDK-21
 new 8bd2379fe2 Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo | 1 +
 Jenkinsfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

[cxf] 01/02: Update Jenkins pipeline to use JDK-21

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 274609cead278eba3ed2c95bf02649e18cf7a492
Author: Andriy Redko 
AuthorDate: Thu Oct 12 19:45:42 2023 -0400

Update Jenkins pipeline to use JDK-21

(cherry picked from commit 9e6e0d3beb7a4b949a960d566b6af92518be260f)

# Conflicts:
#   Jenkinsfile
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ebf88fa85b..e1a486e0cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
 axes {
   axis {
 name 'JAVA_VERSION'
-values 'jdk_11_latest', 'jdk_17_latest', 'jdk_18_latest'
+values 'jdk_11_latest', 'jdk_17_latest', 'jdk_21_latest'
   }
 }
 stages {

[cxf] 02/02: Recording .gitmergeinfo Changes

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8bd2379fe2c9033e9461e51f9b5d99ab7a650978
Author: Andriy Redko 
AuthorDate: Thu Oct 12 19:48:03 2023 -0400

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index bd05877b88..54113eb568 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -537,6 +537,7 @@ M 9c8dc0c1b935f3aa9f67db878fad7d4dbd1474fc
 M 9c93695b123a1de0f93d85e04d31b6e6abd81130
 M 9cb9eb0cfc3c6628793129c7660e0e6de557c963
 M 9e0d6ccd9f376e0c3d45ef04a6e834d5cd1da1ec
+M 9e6e0d3beb7a4b949a960d566b6af92518be260f
 M 9e9baea9cdfc6c1e9a09d851b571e7cfa62df209
 M 9ede4a76d78ffe913c593607ed28d523ba548ba3
 M 9fdf22dfd1ed21a776d935754f1dd02aef67ce95

[cxf] branch main updated: Update Jenkins pipeline to use JDK-21

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
 new 9e6e0d3beb Update Jenkins pipeline to use JDK-21
9e6e0d3beb is described below

commit 9e6e0d3beb7a4b949a960d566b6af92518be260f
Author: Andriy Redko 
AuthorDate: Thu Oct 12 19:45:42 2023 -0400

Update Jenkins pipeline to use JDK-21
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b34eb2b9c3..aa8023e130 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
 axes {
   axis {
 name 'JAVA_VERSION'
-values 'jdk_17_latest', 'jdk_20_latest'
+values 'jdk_17_latest', 'jdk_21_latest'
   }
 }
 stages {

[cxf] branch 3.6.x-fixes updated: Fix OSGi's HttpServiceTest integration tests

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
 new 00176dfb14 Fix OSGi's HttpServiceTest integration tests
00176dfb14 is described below

commit 00176dfb14b9c60ce7f8816e9a5a69a60080e2f4
Author: Andriy Redko 
AuthorDate: Thu Oct 12 19:41:42 2023 -0400

Fix OSGi's HttpServiceTest integration tests
---
 .../java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
index 94e96bce85..0ed2e0f4b3 100644
--- 
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
+++ 
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
@@ -26,7 +26,7 @@ import org.eclipse.jetty.server.handler.ContextHandler;
  */
 class JettyContextHandler extends ContextHandler {
 JettyContextHandler() {
-super(null, null, null);
+super(null, null);
 _scontext = new JettyContext();
 }

[cxf] 02/02: Recording .gitmergeinfo Changes

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 3dbdf24d760379aa3fb21770cd0a5e8ed9c25be4
Author: Andriy Redko 
AuthorDate: Thu Oct 12 19:22:21 2023 -0400

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 0445fa8f29..bd05877b88 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -547,6 +547,7 @@ M a2d821e682a7c48e7ef1784a0da6218bee003cd1
 M a2e3ce536bc9403895c18a7322e78555e1f44bf6
 M a399c0991c5a6eeafed8788df69b35b252c4529d
 M a43799c83305ad33905d757011cb9c7cce4ee6b3
+M a45257eab1333f11f7c5944508c121b8e4a20af6
 M a4bdbdd4ddf9c1a202c7085ebc59fb73ef96db07
 M a54e2dbe6e4dc2d74472e2db523a5290378da325
 M a5772bb53bcf07f91df9dae9805603ee4a7424c2
@@ -649,6 +650,7 @@ M d01b80120c02dbedf67ee595e3c0503df7f71b9d
 M d06c9ece5dbb55cfd444f31668b9d49b9089ef1b
 M d1c6789ba3b82faedf324e19702289cb0d655d7b
 M d26294e7f6a011101ec76bc707255899b7539755
+M d26b74bd9ca6bd5b9fda7c0de32ff4a2773959d2
 M d2ec150230d2d4e016706d3ad9a7f6eb5b649323
 M d34dc893707a99b5b8d7a67d16d99359db65ce11
 M d3d370bf1c53a0bd25395a2d615df4f1a74e8dc3

[cxf] branch 3.6.x-fixes updated (4d2dadfd9b -> 3dbdf24d76)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 4d2dadfd9b Recording .gitmergeinfo Changes
 new 634292eaa0 Update Swagger to 2.2.17
 new 3dbdf24d76 Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo  | 2 ++
 parent/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

[cxf] 01/02: Update Swagger to 2.2.17

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 634292eaa0ba6e8ef98b52fafcf9aee319a5610f
Author: Andriy Redko 
AuthorDate: Thu Oct 12 17:07:58 2023 -0400

Update Swagger to 2.2.17

(cherry picked from commit a45257eab1333f11f7c5944508c121b8e4a20af6)

# Conflicts:
#   parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 084a62d219..28f27a9a49 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
 5.3.30
 1.8.3
 5.7.2
-2.2.16
+2.2.17
 1.6.11
 31.1-jre
 
1.0.1

[cxf] 03/03: Recording .gitmergeinfo Changes

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 4092b1698e271e068d853eb6ee13bfb21d001dae
Author: Andriy Redko 
AuthorDate: Thu Oct 12 17:12:44 2023 -0400

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9358679fbb..1fc4a49be8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -109,6 +109,7 @@ B 493e3b1a9ba7f31ddcf8ccb2cfd82604a988b5cc
 B 4a7a8b57e712dd05e187cf4de6fd58b9b1236847
 B 4b63dbb428488f3a6d0b7114632404b31458a521
 B 4cf375c5436f3e806293a73a5bb6a8510f7ac961
+B 4d2dadfd9bf553d9d64c60a2b0f9e4588e9a1abf
 B 4dbfe49da75fe4b036b095ad0bbf92e195f07fcf
 B 4dd1a221c07430e83a5087206c964a2dc205d3d0
 B 4e49ccab53e40384a5bc3cd966b7a8f2636dcbb3

[cxf] 01/03: Add JAX-WS tests for @Oneway methods to tracing suites

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit d3ed0639eded25b00e63af3e70770df204b23052
Author: Andriy Redko 
AuthorDate: Wed Oct 11 19:45:41 2023 -0400

Add JAX-WS tests for @Oneway methods to tracing suites

(cherry picked from commit 638c8896a1d4e8afbc611416e8b816c43033a016)

# Conflicts:
#   
systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
(cherry picked from commit 8c0bf137f4f99a565c5034709a90ddf5515eec10)
---
 .../cxf/systest/jaxws/tracing/BookStoreService.java |  1 +
 .../cxf/systest/jaxws/tracing/brave/BookStore.java  |  6 ++
 .../systest/jaxws/tracing/brave/BraveTracingTest.java   | 17 +
 .../systest/jaxws/tracing/opentelemetry/BookStore.java  |  5 +
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 14 ++
 .../systest/jaxws/tracing/opentracing/BookStore.java|  5 +
 .../tracing/opentracing/OpenTracingTracingTest.java | 13 +
 7 files changed, 61 insertions(+)

diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
index c6a58cf373..0df92a8202 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
@@ -29,4 +29,5 @@ public interface BookStoreService {
 Collection< Book > getBooks();
 int removeBooks();
 void addBooks();
+void orderBooks();
 }
diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
index 2a1d254574..deb2f52888 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.UUID;
 
 import javax.annotation.Resource;
+import javax.jws.Oneway;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
@@ -72,4 +73,9 @@ public class BookStore implements BookStoreService {
 final MessageContext ctx = context.getMessageContext();
 ctx.put(MessageContext.HTTP_RESPONSE_CODE, 305);
 }
+
+@WebMethod @Oneway
+public void orderBooks() {
+}
+
 }
diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
index d7c3d0b8d1..fc4a3a36dc 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.systest.jaxws.tracing.brave;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -55,6 +56,7 @@ import static 
org.apache.cxf.systest.brave.BraveTestSupport.PARENT_SPAN_ID_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.SAMPLED_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.SPAN_ID_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.TRACE_ID_NAME;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -241,6 +243,21 @@ public class BraveTracingTest extends 
AbstractClientServerTestBase {
 }
 }
 
+@Test
+public void testThatNewInnerSpanIsCreatedOneway() throws Exception {
+try (Tracing brave = createTracer()) {
+final BookStoreService service = createJaxWsService(new 
BraveClientFeature(brave));
+service.orderBooks();
+
+// Await till flush happens, usually every second
+await().atMost(Duration.ofSeconds(1L)).until(() -> 
TestSpanReporter.getAllSpans().size() == 2);
+
+assertThat(TestSpanReporter.getAllSpans().get(0).name(), 
equalTo("post /bookstore"));
+assertThat(TestSpanReporter.getAllSpans().get(1).name(),
+equalTo("post http://localhost:"; + PORT + "/bookstore"));
+}
+}
+

[cxf] branch 3.5.x-fixes updated (68ef47de25 -> 4092b1698e)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 68ef47de25 Update Project Reactor to 3.4.33
 new d3ed0639ed Add JAX-WS tests for @Oneway methods to tracing suites
 new 0c21ef760d Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
 new 4092b1698e Recording .gitmergeinfo Changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo   |  1 +
 distribution/javadoc/pom.xml|  2 +-
 .../samples/jax_rs/description_swagger2_spring/pom.xml  |  4 
 .../samples/jax_rs/tracing_opentelemetry/pom.xml|  2 +-
 .../java/demo/jaxrs/tracing/OpenTelemetrySetup.java |  2 +-
 integration/tracing/tracing-opentelemetry/pom.xml   |  2 +-
 .../AbstractOpenTelemetryClientProvider.java|  2 +-
 .../opentelemetry/AbstractOpenTelemetryProvider.java|  2 +-
 parent/pom.xml  |  6 +++---
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java |  2 +-
 .../cxf/systest/jaxws/tracing/BookStoreService.java |  1 +
 .../cxf/systest/jaxws/tracing/brave/BookStore.java  |  6 ++
 .../systest/jaxws/tracing/brave/BraveTracingTest.java   | 17 +
 .../systest/jaxws/tracing/opentelemetry/BookStore.java  |  5 +
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 16 +++-
 .../systest/jaxws/tracing/opentracing/BookStore.java|  5 +
 .../tracing/opentracing/OpenTracingTracingTest.java | 13 +
 17 files changed, 77 insertions(+), 11 deletions(-)

[cxf] 02/03: Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 0c21ef760da2b1cb4e3e530e4f440909dee5148b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 12 09:11:33 2023 -0400

Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

Bumps `cxf.opentelemetry.version` from 1.30.1 to 1.31.0.

Updates `io.opentelemetry:opentelemetry-bom` from 1.30.1 to 1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

Updates `io.opentelemetry:opentelemetry-opentracing-shim` from 1.30.1 to 
1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-opentracing-shim
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 3b5bd6d81dcd3171faa1546e86e18864f587c2ac)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
#   parent/pom.xml
(cherry picked from commit 63a6c3a1765d298135cae22536d6b743cd942a83)
---
 distribution/javadoc/pom.xml| 2 +-
 .../main/release/samples/jax_rs/description_swagger2_spring/pom.xml | 4 
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 2 +-
 integration/tracing/tracing-opentelemetry/pom.xml   | 2 +-
 .../tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java  | 2 +-
 .../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java| 2 +-
 parent/pom.xml  | 6 +++---
 .../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 .../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 10 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 897a24751a..0fb6f403d0 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -427,7 +427,7 @@
 opentelemetry-api
 
 
-io.opentelemetry
+io.opentelemetry.semconv
 opentelemetry-semconv
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index ff5e5b3f27..8c93a47897 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -98,5 +98,9 @@
 org.springframework
 spring-web
 
+
+io.opentelemetry.semconv
+opentelemetry-semconv
+
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index 314346cce1..0974d66912 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -151,7 +151,7 @@
 opentelemetry-sdk
 
 
-io.opentelemetry
+io.opentelemetry.semconv
 opentelemetry-semconv
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index e60290ec7d..5e9fae4778 100644
--- 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -

[cxf] 01/02: Update Swagger to 2.2.17

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit a45257eab1333f11f7c5944508c121b8e4a20af6
Author: Andriy Redko 
AuthorDate: Thu Oct 12 17:07:58 2023 -0400

Update Swagger to 2.2.17
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 99275f413b..abc9cdc225 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
 6.0.13
 1.8.3
 5.7.2
-2.2.16
+2.2.17
 2.7.0
 10.1.13
 
1.8

[cxf] branch main updated (54e26b97a0 -> d26b74bd9c)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 54e26b97a0 Update Spring Framework to 6.0.13
 new a45257eab1 Update Swagger to 2.2.17
 new d26b74bd9c Update Spring LDAP to 3.0.6

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[cxf] 02/02: Update Spring LDAP to 3.0.6

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit d26b74bd9ca6bd5b9fda7c0de32ff4a2773959d2
Author: Andriy Redko 
AuthorDate: Thu Oct 12 17:08:30 2023 -0400

Update Spring LDAP to 3.0.6
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index abc9cdc225..63afea9a22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,7 +212,7 @@
 2.2
 2.3_2
 3.0.11
-3.0.5
+3.0.6
 spring-test
 6.0.7
 6.0.13

[cxf] 03/03: Recording .gitmergeinfo Changes

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 4d2dadfd9bf553d9d64c60a2b0f9e4588e9a1abf
Author: Andriy Redko 
AuthorDate: Thu Oct 12 11:27:07 2023 -0400

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 4 
 1 file changed, 4 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7f560b51e7..0445fa8f29 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -323,6 +323,7 @@ M 3a2897a5a01c657b2f2c5f87c855470cd092bc5f
 M 3a2ec19943f621daa3d2126e4824ca598808ae89
 M 3a5bf6699e32c4831f3a952535190df3da6fe1fa
 M 3b3ff83cda8fdbea1848d31f8e7fdd54a4a2c4c6
+M 3b5bd6d81dcd3171faa1546e86e18864f587c2ac
 M 3b700961ead8a1c23ef945275bfe4defe22ea81d
 M 3ce2db9d160b107c41c5bcee595ee13d862b7b88
 M 3ce7a90d8b6b96fed6ee74f95f268167e77842eb
@@ -366,6 +367,7 @@ M 4ec898213e8d5b2e12dfe4793ddd5129a41b99c3
 M 4ed5741d56366e3fa4fdb659fecd90afa3610bdc
 M 4edc769daa2dc39db68ce109d38f5722c89c1c62
 M 4f30353a60a7a691a52052d1eaa4df9c15823ba1
+M 4f305be3ca9a184cc488d66f88f40bd40fc03d0b
 M 4feb1632abee093808fff06e03cf9d951c3ac7c9
 M 5147a509abcee1aa885f0fcace2d797e28347608
 M 5183fbf3c51cac50aa96506a03b6884587cec8ec
@@ -375,6 +377,7 @@ M 546340afed9b6ccf0ca655605ce58287f7d16e5c
 M 54919faf04751a1737b4edf95d8e2e7604bd3226
 M 549bae9e692f84ccc1a2a6170fc9bdab2c7fc882
 M 54d0bde599ba55482e6c7a9b98aa0a715b4789b3
+M 54e26b97a03b765a4757e7e24923e90db1dcea89
 M 55265412d3c62ada4003a5f019477ea47eb49c8c
 M 553da4b8131bce33a0242d625eca264a68aaf8ae
 M 557bfc8a53164dbf6f7be4ad3b320c7854f2f8b6
@@ -407,6 +410,7 @@ M 61884fa661644d6863ce12d6d963b820cbdbce0b
 M 61f049ba937bc38b5919dd00b687df2bba53f3c3
 M 6276bff19345877a56ec0fbf81f22b6a1d7e7d1b
 M 634758b2e0352a489e39cb96c9b834369fcb444f
+M 638c8896a1d4e8afbc611416e8b816c43033a016
 M 63a2c2bbf4dcba37bd8fe669d35203f8eb0d019b
 M 63af5b0839c960fa7ea377c820a5ed0096f3f90b
 M 647408469988d9e244086efc839b2f6ab5e42cd7

[cxf] 01/03: Add JAX-WS tests for @Oneway methods to tracing suites

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8c0bf137f4f99a565c5034709a90ddf5515eec10
Author: Andriy Redko 
AuthorDate: Wed Oct 11 19:45:41 2023 -0400

Add JAX-WS tests for @Oneway methods to tracing suites

(cherry picked from commit 638c8896a1d4e8afbc611416e8b816c43033a016)

# Conflicts:
#   
systests/tracing/src/test/java/org/apache/cxf/systest/brave/jaxws/AbstractBraveTracingTest.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/BookStore.java
#   
systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/BookStore.java
---
 .../cxf/systest/jaxws/tracing/BookStoreService.java |  1 +
 .../cxf/systest/jaxws/tracing/brave/BookStore.java  |  6 ++
 .../systest/jaxws/tracing/brave/BraveTracingTest.java   | 17 +
 .../systest/jaxws/tracing/opentelemetry/BookStore.java  |  5 +
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 14 ++
 .../systest/jaxws/tracing/opentracing/BookStore.java|  5 +
 .../tracing/opentracing/OpenTracingTracingTest.java | 13 +
 7 files changed, 61 insertions(+)

diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
index c6a58cf373..0df92a8202 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/BookStoreService.java
@@ -29,4 +29,5 @@ public interface BookStoreService {
 Collection< Book > getBooks();
 int removeBooks();
 void addBooks();
+void orderBooks();
 }
diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
index 2a1d254574..deb2f52888 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BookStore.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.UUID;
 
 import javax.annotation.Resource;
+import javax.jws.Oneway;
 import javax.jws.WebMethod;
 import javax.jws.WebService;
 import javax.xml.ws.WebServiceContext;
@@ -72,4 +73,9 @@ public class BookStore implements BookStoreService {
 final MessageContext ctx = context.getMessageContext();
 ctx.put(MessageContext.HTTP_RESPONSE_CODE, 305);
 }
+
+@WebMethod @Oneway
+public void orderBooks() {
+}
+
 }
diff --git 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
index d7c3d0b8d1..fc4a3a36dc 100644
--- 
a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
+++ 
b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java
@@ -18,6 +18,7 @@
  */
 package org.apache.cxf.systest.jaxws.tracing.brave;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -55,6 +56,7 @@ import static 
org.apache.cxf.systest.brave.BraveTestSupport.PARENT_SPAN_ID_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.SAMPLED_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.SPAN_ID_NAME;
 import static org.apache.cxf.systest.brave.BraveTestSupport.TRACE_ID_NAME;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -241,6 +243,21 @@ public class BraveTracingTest extends 
AbstractClientServerTestBase {
 }
 }
 
+@Test
+public void testThatNewInnerSpanIsCreatedOneway() throws Exception {
+try (Tracing brave = createTracer()) {
+final BookStoreService service = createJaxWsService(new 
BraveClientFeature(brave));
+service.orderBooks();
+
+// Await till flush happens, usually every second
+await().atMost(Duration.ofSeconds(1L)).until(() -> 
TestSpanReporter.getAllSpans().size() == 2);
+
+assertThat(TestSpanReporter.getAllSpans().get(0).name(), 
equalTo("post /bookstore"));
+assertThat(TestSpanReporter.getAllSpans().get(1).name(),
+equalTo("post http://localhost:"; + PORT + "/bookstore"));
+}
+}
+
 private BookStoreService createJaxWsService() {
 return createJa

[cxf] 02/03: Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 63a6c3a1765d298135cae22536d6b743cd942a83
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 12 09:11:33 2023 -0400

Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

Bumps `cxf.opentelemetry.version` from 1.30.1 to 1.31.0.

Updates `io.opentelemetry:opentelemetry-bom` from 1.30.1 to 1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

Updates `io.opentelemetry:opentelemetry-opentracing-shim` from 1.30.1 to 
1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-opentracing-shim
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 3b5bd6d81dcd3171faa1546e86e18864f587c2ac)

# Conflicts:
#   
distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
#   
distribution/src/main/release/samples/jax_rs/tracing_opentracing_camel/pom.xml
#   parent/pom.xml
---
 distribution/javadoc/pom.xml| 2 +-
 .../main/release/samples/jax_rs/description_swagger2_spring/pom.xml | 4 
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 2 +-
 integration/tracing/tracing-opentelemetry/pom.xml   | 2 +-
 .../tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java  | 2 +-
 .../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java| 2 +-
 parent/pom.xml  | 6 +++---
 .../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 .../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 10 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 5cdc73d7b5..fda41ebf04 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -415,7 +415,7 @@
 opentelemetry-api
 
 
-io.opentelemetry
+io.opentelemetry.semconv
 opentelemetry-semconv
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
index f5bcf6d316..2edb4783bd 100644
--- 
a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
+++ 
b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/pom.xml
@@ -98,5 +98,9 @@
 org.springframework
 spring-web
 
+
+io.opentelemetry.semconv
+opentelemetry-semconv
+
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index b748980e41..0382f5b9fd 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
@@ -151,7 +151,7 @@
 opentelemetry-sdk
 
 
-io.opentelemetry
+io.opentelemetry.semconv
 opentelemetry-semconv
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index e60290ec7d..5e9fae4778 100644
--- 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -27,7 +27,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.op

[cxf] branch 3.6.x-fixes updated (121d507418 -> 4d2dadfd9b)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from 121d507418 Update Micrometer to 1.9.16
 new 8c0bf137f4 Add JAX-WS tests for @Oneway methods to tracing suites
 new 63a6c3a176 Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
 new 4d2dadfd9b Recording .gitmergeinfo Changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo   |  4 
 distribution/javadoc/pom.xml|  2 +-
 .../samples/jax_rs/description_swagger2_spring/pom.xml  |  4 
 .../samples/jax_rs/tracing_opentelemetry/pom.xml|  2 +-
 .../java/demo/jaxrs/tracing/OpenTelemetrySetup.java |  2 +-
 integration/tracing/tracing-opentelemetry/pom.xml   |  2 +-
 .../AbstractOpenTelemetryClientProvider.java|  2 +-
 .../opentelemetry/AbstractOpenTelemetryProvider.java|  2 +-
 parent/pom.xml  |  6 +++---
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java |  2 +-
 .../cxf/systest/jaxws/tracing/BookStoreService.java |  1 +
 .../cxf/systest/jaxws/tracing/brave/BookStore.java  |  6 ++
 .../systest/jaxws/tracing/brave/BraveTracingTest.java   | 17 +
 .../systest/jaxws/tracing/opentelemetry/BookStore.java  |  5 +
 .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 16 +++-
 .../systest/jaxws/tracing/opentracing/BookStore.java|  5 +
 .../tracing/opentracing/OpenTracingTracingTest.java | 13 +
 17 files changed, 80 insertions(+), 11 deletions(-)

[cxf] branch main updated: Update Spring Framework to 6.0.13

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
 new 54e26b97a0 Update Spring Framework to 6.0.13
54e26b97a0 is described below

commit 54e26b97a03b765a4757e7e24923e90db1dcea89
Author: Andriy Redko 
AuthorDate: Thu Oct 12 10:55:19 2023 -0400

Update Spring Framework to 6.0.13
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 9bb23c8920..99275f413b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -215,7 +215,7 @@
 3.0.5
 spring-test
 6.0.7
-6.0.12
+6.0.13
 1.8.3
 5.7.2
 2.2.16

[cxf] branch dependabot/maven/cxf.opentelemetry.version-1.31.0 deleted (was f7ade22bf5)

2023-10-12 Thread github-bot 
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch 
dependabot/maven/cxf.opentelemetry.version-1.31.0
in repository https://gitbox.apache.org/repos/asf/cxf.git


 was f7ade22bf5 Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[cxf] branch main updated: Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

2023-10-12 Thread reta 
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/main by this push:
 new 3b5bd6d81d Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)
3b5bd6d81d is described below

commit 3b5bd6d81dcd3171faa1546e86e18864f587c2ac
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 12 09:11:33 2023 -0400

Bump cxf.opentelemetry.version from 1.30.1 to 1.31.0 (#1463)

Bumps `cxf.opentelemetry.version` from 1.30.1 to 1.31.0.

Updates `io.opentelemetry:opentelemetry-bom` from 1.30.1 to 1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

Updates `io.opentelemetry:opentelemetry-opentracing-shim` from 1.30.1 to 
1.31.0
- [Release 
notes](https://github.com/open-telemetry/opentelemetry-java/releases)
- 
[Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md)
- 
[Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.30.1...v1.31.0)

---
updated-dependencies:
- dependency-name: io.opentelemetry:opentelemetry-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.opentelemetry:opentelemetry-opentracing-shim
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 distribution/javadoc/pom.xml| 2 +-
 .../src/main/release/samples/jax_rs/tracing_micrometer/pom.xml  | 4 
 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 2 +-
 .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml   | 2 +-
 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 2 +-
 .../main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 2 +-
 integration/tracing/tracing-opentelemetry/pom.xml   | 2 +-
 .../tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java  | 2 +-
 .../cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java| 2 +-
 parent/pom.xml  | 6 +++---
 .../jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 .../jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java   | 2 +-
 12 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index e4a1133877..732b6582e4 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -395,7 +395,7 @@
 opentelemetry-api
 
 
-io.opentelemetry
+io.opentelemetry.semconv
 opentelemetry-semconv
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
index df341513a9..7bdc418350 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml
@@ -150,5 +150,9 @@
 io.opentelemetry
 opentelemetry-exporter-logging
 
+
+io.opentelemetry.semconv
+opentelemetry-semconv
+
 
 
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
 
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
index 60f9d44692..3d7eb6aad0 100644
--- 
a/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
+++ 
b/distribution/src/main/release/samples/jax_rs/tracing_micrometer/src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java
@@ -26,7 +26,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 public class OpenTelemetrySetup {
 public static OpenTelemetrySdk setup(String serviceName) {
diff --git 
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml 
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index c1dfc5c1b4..f2cc650722 100644
--- a/distribution/src/main/rel