[cxf] branch dependabot/maven/cxf.hazelcast.version-5.3.2 created (now 8b511b467e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/cxf.hazelcast.version-5.3.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at 8b511b467e Bump cxf.hazelcast.version from 5.3.1 to 5.3.2 No new revisions were added by this update.
[cxf] branch dependabot/maven/org.webjars-swagger-ui-5.4.2 created (now 52257c5b43)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.webjars-swagger-ui-5.4.2 in repository https://gitbox.apache.org/repos/asf/cxf.git at 52257c5b43 Bump org.webjars:swagger-ui from 5.3.1 to 5.4.2 No new revisions were added by this update.
[cxf] 02/03: CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
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 d786f282eeffc8e76d3e5152a9e49103d550e6f9
Author: Andriy Redko
AuthorDate: Mon Aug 21 12:16:28 2023 -0400
CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
(cherry picked from commit 22d97aa326eefc6c4758c24179cf564d9b4bc47f)
# Conflicts:
#
integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/jaxrs/OpenTelemetryFeature.java
---
.../java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 4 ++--
.../main/java/demo/jaxrs/tracing/client/Client.java| 4 ++--
.../AbstractOpenTelemetryClientInterceptor.java| 9 -
.../AbstractOpenTelemetryClientProvider.java | 8 ++--
.../AbstractOpenTelemetryInterceptor.java | 11 +--
.../opentelemetry/AbstractOpenTelemetryProvider.java | 6 +-
.../opentelemetry/OpenTelemetryClientFeature.java | 15 +--
.../OpenTelemetryClientStartInterceptor.java | 10 ++
.../OpenTelemetryClientStopInterceptor.java| 14 --
.../tracing/opentelemetry/OpenTelemetryFeature.java| 14 --
.../opentelemetry/OpenTelemetryStartInterceptor.java | 8 ++--
.../opentelemetry/OpenTelemetryStopInterceptor.java| 5 +
.../jaxrs/OpenTelemetryClientProvider.java | 5 +
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 18 --
.../opentelemetry/jaxrs/OpenTelemetryProvider.java | 5 +
15 files changed, 112 insertions(+), 24 deletions(-)
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 dd5a04c851..e60290ec7d 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
@@ -36,11 +36,11 @@ public class OpenTelemetrySetup {
Resource resource = Resource.getDefault()
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME,
serviceName)));
-SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build())
.setResource(resource).build();
-OpenTelemetrySdk openTelemetrySdk =
OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
+final OpenTelemetrySdk openTelemetrySdk =
OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
.buildAndRegisterGlobal();
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
index eda7265da2..94974f56dc 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Response;
import demo.jaxrs.tracing.OpenTelemetrySetup;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.tracing.opentelemetry.OpenTelemetryFeature;
+import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryFeature;
import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryClientProvider;
import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -38,7 +38,7 @@ public final class Client {
public static void main(final String[] args) throws Exception {
try (OpenTelemetrySdk openTelemetry =
OpenTelemetrySetup.setup(Client.class.getName())) {
final OpenTelemetryClientProvider provider = new
OpenTelemetryClientProvider(openTelemetry,
-
OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME);
+
openTelemetry.getTracer(OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME));
final Response response = WebClient
.create("http://localhost:9000/catalog;,
Arrays.asList(provider))
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java
[cxf] 01/03: Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394)
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 6a30d229f487a9446431a4c254c46d74be26a200 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Aug 21 08:02:43 2023 -0400 Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 8.3.1 to 8.4.0. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.3.1...v8.4.0) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven 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 59641959edcfaa379dba7d0adaca11e88c3cff7a) # Conflicts: # pom.xml --- parent/pom.xml | 1 + pom.xml| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8c3d8bcb50..3aafb2d92c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -6,6 +6,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 diff --git a/pom.xml b/pom.xml index 552d528b10..f2a6e11332 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 11 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -8.2.1 +8.4.0
[cxf] 03/03: Recording .gitmergeinfo Changes
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 dab72900c97b508025c6b6e84f6658a6c0605b04 Author: Andriy Redko AuthorDate: Mon Aug 21 21:48:03 2023 -0400 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 7c06630e55..21f4fd73b7 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -242,6 +242,7 @@ M 217d8a7cd6ab50593afbd3dfd539992f7dc3844d M 21d3ff920418c7325b2e4b32d7b49cca9681b3ec M 227e81b07f547106af5e76af7e526fc6c3c8ffc2 M 2293ef355cd13d6aa73785f750c33c94fa8a746e +M 22d97aa326eefc6c4758c24179cf564d9b4bc47f M 230fc881ed63bc56dbcb9b86f7e5a9eda4e15466 M 23fdd237d48a05ac1c3518e9bd90165067aadcf0 M 24151890ce517fcd8cfb5db08251e9088f4d7e85 @@ -346,6 +347,7 @@ M 57999b80bbdb93016dd8b336f671d83f3eaf3c8c M 57fc08eb5ce64641b01504747eb277898bd9c47f M 58489c178816eab367f19f0b3c0e44f32ae0f6a1 M 594a3bd6741e18d83ee02eb07c9b1cfd3e1dce52 +M 59641959edcfaa379dba7d0adaca11e88c3cff7a M 59bd624dabd116f069ea69e039237c29e0af2c0c M 5a848f2994f5d7fe76a325a34baa2481c02cf2a3 M 5af87bddb070ddd14c56bb3e764a831b32b5e456
[cxf] branch 3.6.x-fixes updated (bdcbca177e -> dab72900c9)
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 bdcbca177e Recording .gitmergeinfo Changes new 6a30d229f4 Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394) new d786f282ee CXF-8457: Provide OpenTelemetry support (minor API usability improvements) new dab72900c9 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 | 2 ++ .../java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 4 ++-- .../main/java/demo/jaxrs/tracing/client/Client.java| 4 ++-- .../AbstractOpenTelemetryClientInterceptor.java| 9 - .../AbstractOpenTelemetryClientProvider.java | 8 ++-- .../AbstractOpenTelemetryInterceptor.java | 11 +-- .../opentelemetry/AbstractOpenTelemetryProvider.java | 6 +- .../opentelemetry/OpenTelemetryClientFeature.java | 15 +-- .../OpenTelemetryClientStartInterceptor.java | 10 ++ .../OpenTelemetryClientStopInterceptor.java| 14 -- .../tracing/opentelemetry/OpenTelemetryFeature.java| 14 -- .../opentelemetry/OpenTelemetryStartInterceptor.java | 8 ++-- .../opentelemetry/OpenTelemetryStopInterceptor.java| 5 + .../jaxrs/OpenTelemetryClientProvider.java | 5 + .../opentelemetry/jaxrs/OpenTelemetryFeature.java | 18 -- .../opentelemetry/jaxrs/OpenTelemetryProvider.java | 5 + parent/pom.xml | 1 + pom.xml| 2 +- 18 files changed, 116 insertions(+), 25 deletions(-)
[cxf] branch main updated: CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
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 22d97aa326 CXF-8457: Provide OpenTelemetry support (minor API
usability improvements)
22d97aa326 is described below
commit 22d97aa326eefc6c4758c24179cf564d9b4bc47f
Author: Andriy Redko
AuthorDate: Mon Aug 21 12:16:28 2023 -0400
CXF-8457: Provide OpenTelemetry support (minor API usability improvements)
---
.../java/demo/jaxrs/tracing/OpenTelemetrySetup.java| 4 ++--
.../main/java/demo/jaxrs/tracing/client/Client.java| 4 ++--
.../AbstractOpenTelemetryClientInterceptor.java| 9 -
.../AbstractOpenTelemetryClientProvider.java | 8 ++--
.../AbstractOpenTelemetryInterceptor.java | 11 +--
.../opentelemetry/AbstractOpenTelemetryProvider.java | 6 +-
.../opentelemetry/OpenTelemetryClientFeature.java | 17 ++---
.../OpenTelemetryClientStartInterceptor.java | 10 ++
.../OpenTelemetryClientStopInterceptor.java| 14 --
.../tracing/opentelemetry/OpenTelemetryFeature.java| 14 --
.../opentelemetry/OpenTelemetryStartInterceptor.java | 8 ++--
.../opentelemetry/OpenTelemetryStopInterceptor.java| 5 +
.../jaxrs/OpenTelemetryClientProvider.java | 5 +
.../opentelemetry/jaxrs/OpenTelemetryFeature.java | 18 --
.../opentelemetry/jaxrs/OpenTelemetryProvider.java | 5 +
15 files changed, 113 insertions(+), 25 deletions(-)
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 dd5a04c851..e60290ec7d 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
@@ -36,11 +36,11 @@ public class OpenTelemetrySetup {
Resource resource = Resource.getDefault()
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME,
serviceName)));
-SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build())
.setResource(resource).build();
-OpenTelemetrySdk openTelemetrySdk =
OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
+final OpenTelemetrySdk openTelemetrySdk =
OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
.setPropagators(ContextPropagators.create(W3CTraceContextPropagator.getInstance()))
.buildAndRegisterGlobal();
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
index 69cce61941..faa0d05ca1 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -25,7 +25,7 @@ import demo.jaxrs.tracing.OpenTelemetrySetup;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.tracing.opentelemetry.OpenTelemetryFeature;
+import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryFeature;
import org.apache.cxf.tracing.opentelemetry.jaxrs.OpenTelemetryClientProvider;
import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -37,7 +37,7 @@ public final class Client {
public static void main(final String[] args) throws Exception {
try (OpenTelemetrySdk openTelemetry =
OpenTelemetrySetup.setup(Client.class.getName())) {
final OpenTelemetryClientProvider provider = new
OpenTelemetryClientProvider(openTelemetry,
-
OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME);
+
openTelemetry.getTracer(OpenTelemetryFeature.DEFAULT_INSTRUMENTATION_NAME));
final Response response = WebClient
.create("http://localhost:9000/catalog;,
Arrays.asList(provider))
diff --git
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientInterceptor.java
[cxf] branch main updated: Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394)
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 59641959ed Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394) 59641959ed is described below commit 59641959edcfaa379dba7d0adaca11e88c3cff7a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Aug 21 08:02:43 2023 -0400 Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.0 (#1394) Bumps [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) from 8.3.1 to 8.4.0. - [Release notes](https://github.com/jeremylong/DependencyCheck/releases) - [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md) - [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.3.1...v8.4.0) --- updated-dependencies: - dependency-name: org.owasp:dependency-check-maven 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fdb1192ac..a9ada70768 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 11 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site -8.3.1 +8.4.0
[cxf] branch dependabot/maven/org.owasp-dependency-check-maven-8.4.0 deleted (was 9151ad2d83)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.owasp-dependency-check-maven-8.4.0 in repository https://gitbox.apache.org/repos/asf/cxf.git was 9151ad2d83 Bump org.owasp:dependency-check-maven from 8.3.1 to 8.4.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.
