You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2024/03/30 01:36:21 UTC
(cxf) branch 3.6.x-fixes updated (84b7aa4748 -> fc65d1b26d)
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 84b7aa4748 Recording .gitmergeinfo Changes
new f8c85205cb Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773)
new d654a3fe8f Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
new fc65d1b26d 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 ++
distribution/javadoc/pom.xml | 4 ++++
.../samples/jax_rs/description_swagger2_spring/pom.xml | 4 ++++
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++++
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
integration/tracing/tracing-opentelemetry/pom.xml | 4 ++++
.../opentelemetry/AbstractOpenTelemetryClientProvider.java | 12 +++++++-----
.../tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 9 +++++----
osgi/karaf/features/src/main/resources/features.xml | 3 ++-
parent/pom.xml | 9 +++++++--
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +++++-----
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++---
12 files changed, 49 insertions(+), 22 deletions(-)
(cxf) 02/03: Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
Posted by re...@apache.org.
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 d654a3fe8f3811e94f63c25657bcda7c47bc742b
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Mar 29 17:21:37 2024 -0400
Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
Bumps [io.opentelemetry.semconv:opentelemetry-semconv](https://github.com/open-telemetry/semantic-conventions-java) from 1.23.1-alpha to 1.24.0-alpha.
- [Release notes](https://github.com/open-telemetry/semantic-conventions-java/releases)
- [Changelog](https://github.com/open-telemetry/semantic-conventions-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/semantic-conventions-java/commits)
---
updated-dependencies:
- dependency-name: io.opentelemetry.semconv:opentelemetry-semconv
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit 249e42e88f3fb73c1a64ecc433fbbb0920a8f6f0)
# 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
---
distribution/javadoc/pom.xml | 4 ++++
.../samples/jax_rs/description_swagger2_spring/pom.xml | 4 ++++
.../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 ++++
.../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++--
integration/tracing/tracing-opentelemetry/pom.xml | 4 ++++
.../opentelemetry/AbstractOpenTelemetryClientProvider.java | 12 +++++++-----
.../tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 9 +++++----
osgi/karaf/features/src/main/resources/features.xml | 3 ++-
parent/pom.xml | 7 ++++++-
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +++++-----
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++---
11 files changed, 46 insertions(+), 21 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 2048695071..c6cfa66d93 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -418,6 +418,10 @@
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ </dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
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 98cfc5b029..16df930d90 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
@@ -102,5 +102,9 @@
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ </dependency>
</dependencies>
</project>
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 6fa407e0f7..15da7c8562 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
@@ -154,6 +154,10 @@
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ </dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
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 5e9fae4778..7f66981d5d 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,14 +27,14 @@ 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.ResourceAttributes;
+import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
import io.opentracing.util.GlobalTracer;
public class OpenTelemetrySetup {
public static OpenTelemetrySdk setup(String serviceName) {
Resource resource = Resource.getDefault()
- .merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, serviceName)));
+ .merge(Resource.create(Attributes.of(ServiceIncubatingAttributes.SERVICE_NAME, serviceName)));
final SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(BatchSpanProcessor.builder(LoggingSpanExporter.create()).build())
diff --git a/integration/tracing/tracing-opentelemetry/pom.xml b/integration/tracing/tracing-opentelemetry/pom.xml
index 738a8bec1c..7a4a46ae9d 100644
--- a/integration/tracing/tracing-opentelemetry/pom.xml
+++ b/integration/tracing/tracing-opentelemetry/pom.xml
@@ -81,6 +81,10 @@
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
index 52cfd7e893..2ffde203b1 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryClientProvider.java
@@ -36,7 +36,9 @@ import io.opentelemetry.api.trace.StatusCode;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
-import io.opentelemetry.semconv.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.semconv.incubating.ExceptionIncubatingAttributes;
public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractOpenTelemetryClientProvider.class);
@@ -59,8 +61,8 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
Context parentContext = Context.current();
Span activeSpan = tracer.spanBuilder(buildSpanDescription(uri.toString(), method))
.setParent(parentContext).setSpanKind(SpanKind.CLIENT)
- .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
- .setAttribute(SemanticAttributes.URL_FULL, uri.toString())
+ .setAttribute(HttpAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(UrlAttributes.URL_FULL, uri.toString())
// TODO: Enhance with semantics from request
.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -100,7 +102,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus);
+ span.setAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE.getKey(), responseStatus);
span.end();
@@ -126,7 +128,7 @@ public abstract class AbstractOpenTelemetryClientProvider extends AbstractTracin
span.setStatus(StatusCode.ERROR);
if (ex != null) {
- span.recordException(ex, Attributes.of(SemanticAttributes.EXCEPTION_ESCAPED, true));
+ span.recordException(ex, Attributes.of(ExceptionIncubatingAttributes.EXCEPTION_ESCAPED, true));
}
span.end();
diff --git a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
index b23d47537a..d9b7d6e2ce 100644
--- a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
+++ b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/AbstractOpenTelemetryProvider.java
@@ -35,7 +35,8 @@ import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
-import io.opentelemetry.semconv.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractOpenTelemetryProvider.class);
@@ -63,8 +64,8 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
SpanBuilder spanBuilder = tracer.spanBuilder(buildSpanDescription(uri.getPath(), method))
.setSpanKind(SpanKind.SERVER)
- .setAttribute(SemanticAttributes.HTTP_REQUEST_METHOD, method)
- .setAttribute(SemanticAttributes.URL_FULL, uri.toString());
+ .setAttribute(HttpAttributes.HTTP_REQUEST_METHOD, method)
+ .setAttribute(UrlAttributes.URL_FULL, uri.toString());
Span activeSpan = spanBuilder.startSpan();
Scope scope = activeSpan.makeCurrent();
@@ -104,7 +105,7 @@ public abstract class AbstractOpenTelemetryProvider extends AbstractTracingProvi
scope = span.makeCurrent();
}
- span.setAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus);
+ span.setAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, responseStatus);
span.end();
scope.close();
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 099286d844..254fb5cb44 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -316,7 +316,8 @@
<feature version="${project.version}">cxf-core</feature>
<bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-api/${cxf.opentelemetry.version}</bundle>
<bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-context/${cxf.opentelemetry.version}</bundle>
- <bundle start-level="35">wrap:mvn:io.opentelemetry/opentelemetry-semconv/${cxf.opentelemetry.semconv.version}</bundle>
+ <bundle start-level="35">wrap:mvn:io.opentelemetry.semconv/opentelemetry-semconv/${cxf.opentelemetry.semconv.version}</bundle>
+ <bundle start-level="35">wrap:mvn:io.opentelemetry.semconv/opentelemetry-semconv-incubating/${cxf.opentelemetry.semconv.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-integration-tracing-opentelemetry/${project.version}</bundle>
</feature>
<feature name="cxf-rs-description-swagger2" version="${project.version}">
diff --git a/parent/pom.xml b/parent/pom.xml
index a3dc759e15..b307d235a6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,7 +184,7 @@
<cxf.opensaml.osgi.version.range>[3.1,4)</cxf.opensaml.osgi.version.range>
<cxf.opensaml.osgi.version>3.4.6_3</cxf.opensaml.osgi.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>2.2.3</cxf.persistence-api.version>
@@ -1905,6 +1905,11 @@
<artifactId>opentelemetry-semconv</artifactId>
<version>${cxf.opentelemetry.semconv.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.opentelemetry.semconv</groupId>
+ <artifactId>opentelemetry-semconv-incubating</artifactId>
+ <version>${cxf.opentelemetry.semconv.version}</version>
+ </dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-opentracing-shim</artifactId>
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
index d49604f3bf..cc26fc8ac7 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -62,7 +62,7 @@ import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.context.propagation.TextMapSetter;
import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
-import io.opentelemetry.semconv.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
import org.junit.After;
import org.junit.BeforeClass;
@@ -126,7 +126,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().get(0).getName(), equalTo("Get Books"));
assertThat(otelRule.getSpans().get(1).getName(), equalTo("GET /bookstore/books"));
assertThat(otelRule.getSpans().get(1).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 200L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 200L));
assertThat(otelRule.getSpans().get(1).getInstrumentationScopeInfo().getName(),
equalTo("jaxrs-server-test"));
}
@@ -397,7 +397,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/exception"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
}
@Test
@@ -408,7 +408,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/error"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 503L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 503L));
}
@Test
@@ -419,7 +419,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().toString(), otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("GET /bookstore/books/mapper"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 404L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 404L));
}
private WebClient withTrace(final WebClient client) {
diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
index f24d254bca..b6e3859dd2 100644
--- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
+++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java
@@ -53,7 +53,7 @@ import io.opentelemetry.api.trace.TraceState;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.sdk.testing.junit4.OpenTelemetryRule;
-import io.opentelemetry.semconv.SemanticAttributes;
+import io.opentelemetry.semconv.HttpAttributes;
import org.junit.After;
import org.junit.BeforeClass;
@@ -238,7 +238,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(2));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 500L));
assertThat(otelRule.getSpans().get(1).getName(),
equalTo("POST http://localhost:" + PORT + "/BookStore"));
}
@@ -253,7 +253,7 @@ public class OpenTelemetryTracingTest extends AbstractClientServerTestBase {
assertThat(otelRule.getSpans().size(), equalTo(1));
assertThat(otelRule.getSpans().get(0).getName(), equalTo("POST /BookStore"));
assertThat(otelRule.getSpans().get(0).getAttributes(),
- hasAttribute(SemanticAttributes.HTTP_RESPONSE_STATUS_CODE, 202L));
+ hasAttribute(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 202L));
}
@Test
(cxf) 03/03: Recording .gitmergeinfo Changes
Posted by re...@apache.org.
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 fc65d1b26d7b6a089ae6f5ee5ebefdfbba14393f
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Mar 29 21:24:28 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3a74b0ad8f..2c06f7e013 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -301,6 +301,7 @@ M 23fdd237d48a05ac1c3518e9bd90165067aadcf0
M 24151890ce517fcd8cfb5db08251e9088f4d7e85
M 2419865a4d160ef5973d3fbb8adb3dd50472e6a3
M 2428b23af56d21892152d727c61cb74d5f8c8869
+M 249e42e88f3fb73c1a64ecc433fbbb0920a8f6f0
M 24b749e191c51a1a6e509dfaef482380d0859120
M 25155190b2ab7adfa333132dc97059f7a5303004
M 251b21b314f14e1a2b5cc38a15d26baa19993033
@@ -865,6 +866,7 @@ M ded51b955c67bc232e961200b6dc6b59c07bdf32
M df7fe8b569a7b8825ab6181a3ea0aab2a2493858
M dfc204777b4c397971b2293baf0b4150284a21f6
M e019e5b848d482ef7b3764a4c651e84a2bc08b47
+M e077f26fa00c3befa617a1f44ff11ae171e5d30f
M e0c50551c62e2a20e7303a185c03745eae54ab11
M e0da0e4af33fa0d5e0ccad3093eee26eb3be140c
M e12d85ba730fcda72afd61652c5c8e708d6d0456
(cxf) 01/03: Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773)
Posted by re...@apache.org.
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 f8c85205cb4260922ccebf4059b465319e749b67
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Mar 28 08:08:35 2024 -0400
Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773)
Bumps [com.fasterxml.woodstox:woodstox-core](https://github.com/FasterXML/woodstox) from 6.6.1 to 6.6.2.
- [Commits](https://github.com/FasterXML/woodstox/compare/woodstox-core-6.6.1...woodstox-core-6.6.2)
---
updated-dependencies:
- dependency-name: com.fasterxml.woodstox:woodstox-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
(cherry picked from commit e077f26fa00c3befa617a1f44ff11ae171e5d30f)
# 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 b520996fea..a3dc759e15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -229,7 +229,7 @@
<cxf.velocity.version>2.3</cxf.velocity.version>
<cxf.wildfly.common.version>1.7.0.Final</cxf.wildfly.common.version>
<cxf.wiremock.version>2.35.1</cxf.wiremock.version>
- <cxf.woodstox.core.version>6.6.1</cxf.woodstox.core.version>
+ <cxf.woodstox.core.version>6.6.2</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>4.2.1</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.4.3</cxf.wss4j.version>