(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) 01/03: Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773)
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] <49699333+dependabot[bot]@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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@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 @@ 2.3 1.7.0.Final 2.35.1 -6.6.1 +6.6.2 4.2.1 1.6.3 2.4.3
(cxf) 02/03: Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
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] <49699333+dependabot[bot]@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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@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 @@ io.opentelemetry.semconv opentelemetry-semconv + +io.opentelemetry.semconv +opentelemetry-semconv-incubating + io.opentracing opentracing-util 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 @@ io.opentelemetry.semconv opentelemetry-semconv + +io.opentelemetry.semconv +opentelemetry-semconv-incubating + 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 @@ io.opentelemetry.semconv opentelemetry-semconv + +io.opentelemetry.semconv +opentelemetry-semconv-incubating + io.opentelemetry opentelemetry-exporter-logging 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.ServiceIncub
(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 fc65d1b26d7b6a089ae6f5ee5ebefdfbba14393f Author: Andriy Redko 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) branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha deleted (was 012388209a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha in repository https://gitbox.apache.org/repos/asf/cxf.git was 012388209a Bump io.opentelemetry.semconv:opentelemetry-semconv 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 io.opentelemetry.semconv:opentelemetry-semconv (#1774)
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 249e42e88f Bump io.opentelemetry.semconv:opentelemetry-semconv (#1774)
249e42e88f is described below
commit 249e42e88f3fb73c1a64ecc433fbbb0920a8f6f0
Author: dependabot[bot] <49699333+dependabot[bot]@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]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
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 | 7 ++-
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +-
.../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++---
12 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/distribution/javadoc/pom.xml b/distribution/javadoc/pom.xml
index 7ce5e0e57b..029df91f7d 100644
--- a/distribution/javadoc/pom.xml
+++ b/distribution/javadoc/pom.xml
@@ -395,6 +395,10 @@
io.opentelemetry.semconv
opentelemetry-semconv
+
+io.opentelemetry.semconv
+opentelemetry-semconv-incubating
+
io.opentracing
opentracing-util
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 5b4384f6b5..51bc5466da 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
@@ -154,5 +154,9 @@
io.opentelemetry.semconv
opentelemetry-semconv
+
+io.opentelemetry.semconv
+opentelemetry-semconv-incubating
+
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 3d7eb6aad0..14f8bcfd80 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,12 +26,12 @@ 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;
public class OpenTelemetrySetup {
public static OpenTelemetrySdk setup(String serviceName) {
final 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/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
b/distribution/src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml
index b5aa96020d..05fd728182 100644
--- a/distrib
(cxf) branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha updated (1ad40de1d2 -> 012388209a)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha in repository https://gitbox.apache.org/repos/asf/cxf.git discard 1ad40de1d2 Bump io.opentelemetry.semconv:opentelemetry-semconv add 012388209a Bump io.opentelemetry.semconv:opentelemetry-semconv This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1ad40de1d2) \ N -- N -- N refs/heads/dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha (012388209a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: distribution/javadoc/pom.xml | 4 1 file changed, 4 insertions(+)
(cxf) branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha updated (0fc7a7deb5 -> 1ad40de1d2)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha in repository https://gitbox.apache.org/repos/asf/cxf.git discard 0fc7a7deb5 Bump io.opentelemetry.semconv:opentelemetry-semconv add 1ad40de1d2 Bump io.opentelemetry.semconv:opentelemetry-semconv This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0fc7a7deb5) \ N -- N -- N refs/heads/dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha (1ad40de1d2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../src/main/release/samples/jax_rs/tracing_micrometer/pom.xml| 4 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++-- .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 4 .../src/main/java/demo/jaxrs/tracing/OpenTelemetrySetup.java | 4 ++-- .../main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 4 5 files changed, 16 insertions(+), 4 deletions(-)
(cxf) branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha updated (cb53d189cb -> 0fc7a7deb5)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha in repository https://gitbox.apache.org/repos/asf/cxf.git omit cb53d189cb Bump io.opentelemetry.semconv:opentelemetry-semconv add e077f26fa0 Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773) add 9e67851dca Bump org.jboss.ws.cxf:jbossws-cxf-client from 7.0.0.Final to 7.1.0.Final (#1772) add 0fc7a7deb5 Bump io.opentelemetry.semconv:opentelemetry-semconv This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cb53d189cb) \ N -- N -- N refs/heads/dependabot/maven/io.opentelemetry.semconv-opentelemetry-semconv-1.24.0-alpha (0fc7a7deb5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: distribution/src/main/release/samples/ws_transaction/pom.xml | 2 +- integration/tracing/tracing-opentelemetry/pom.xml| 4 .../opentelemetry/AbstractOpenTelemetryClientProvider.java | 12 +++- .../tracing/opentelemetry/AbstractOpenTelemetryProvider.java | 9 + parent/pom.xml | 7 ++- .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 10 +- .../tracing/opentelemetry/OpenTelemetryTracingTest.java | 6 +++--- 7 files changed, 31 insertions(+), 19 deletions(-)
(cxf) branch CXF-8671 updated (9046550817 -> d3ffd9d8d9)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch CXF-8671 in repository https://gitbox.apache.org/repos/asf/cxf.git from 9046550817 Merge remote-tracking branch 'origin/main' into CXF-8671 new 2375e5f65c Update Apache Camel to 4.5.0 new d3ffd9d8d9 Update Spring Cloud Eureka to 4.1.1 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: distribution/src/main/release/samples/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(cxf) 01/02: Update Apache Camel to 4.5.0
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 2375e5f65c6814e1c44bb81ceae3b7b3ace1e7c4 Author: Andriy Redko AuthorDate: Fri Mar 29 10:47:17 2024 -0400 Update Apache Camel to 4.5.0 --- distribution/src/main/release/samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index fbb3d99c8f..536afe685b 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -50,7 +50,7 @@ 2.2.224 5.13.1.Final 2.6.7 -4.4.1 +4.5.0
(cxf) 02/02: Update Spring Cloud Eureka to 4.1.1
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 d3ffd9d8d9f4b5982b4f5850584fc9d1e4bd71fe Author: Andriy Redko AuthorDate: Fri Mar 29 10:49:16 2024 -0400 Update Spring Cloud Eureka to 4.1.1 --- distribution/src/main/release/samples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml index 536afe685b..dd46a1f558 100644 --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@ -32,7 +32,7 @@ true UTF-8 3.2.4 - 4.1.0 + 4.1.1 12.0.7 4.1.108.Final 4.5.14
(cxf) branch dependabot/maven/org.apache.camel.springboot-camel-spring-boot-dependencies-4.5.0 deleted (was 62a179a4a5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.camel.springboot-camel-spring-boot-dependencies-4.5.0 in repository https://gitbox.apache.org/repos/asf/cxf.git was 62a179a4a5 Bump org.apache.camel.springboot:camel-spring-boot-dependencies 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 CXF-8671 updated (53db78e39a -> 9046550817)
This is an automated email from the ASF dual-hosted git repository. reta pushed a change to branch CXF-8671 in repository https://gitbox.apache.org/repos/asf/cxf.git from 53db78e39a Merge remote-tracking branch 'origin/main' into CXF-8671 add afc92891fb Update cyclonedx-maven-plugin to 2.8.0 add 2646abd33c Temporary exclude some build agents from the label (due to persistent issues) add 8cafd76567 Bump actions/cache from 4.0.1 to 4.0.2 (#1766) add 661113898a Bump org.ow2.asm:asm from 9.6 to 9.7 (#1764) add 8696926880 Bump cxf.aspectj.version from 1.9.21.2 to 1.9.22 (#1767) add 90d83d8534 Bump org.apache.maven.plugins:maven-gpg-plugin from 3.2.1 to 3.2.2 (#1770) add c570caabbd Bump org.webjars:swagger-ui from 5.12.0 to 5.12.2 (#1769) add e077f26fa0 Bump com.fasterxml.woodstox:woodstox-core from 6.6.1 to 6.6.2 (#1773) add 9e67851dca Bump org.jboss.ws.cxf:jbossws-cxf-client from 7.0.0.Final to 7.1.0.Final (#1772) new 9046550817 Merge remote-tracking branch 'origin/main' into CXF-8671 The 1 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: .github/workflows/codeql-analysis.yml| 2 +- Jenkinsfile | 6 +++--- distribution/src/main/release/samples/pom.xml| 4 ++-- distribution/src/main/release/samples/ws_transaction/pom.xml | 2 +- parent/pom.xml | 8 pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-)
(cxf) 01/01: Merge remote-tracking branch 'origin/main' into CXF-8671
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 9046550817506571b0616243a5b841e44d78e656 Merge: 53db78e39a 9e67851dca Author: Andriy Redko AuthorDate: Fri Mar 29 10:45:10 2024 -0400 Merge remote-tracking branch 'origin/main' into CXF-8671 .github/workflows/codeql-analysis.yml| 2 +- Jenkinsfile | 6 +++--- distribution/src/main/release/samples/pom.xml| 4 ++-- distribution/src/main/release/samples/ws_transaction/pom.xml | 2 +- parent/pom.xml | 8 pom.xml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --cc distribution/src/main/release/samples/pom.xml index ba291e0f06,f419ce48f2..fbb3d99c8f --- a/distribution/src/main/release/samples/pom.xml +++ b/distribution/src/main/release/samples/pom.xml @@@ -31,19 -31,19 +31,19 @@@ true UTF-8 -3.0.13 - 4.0.3 -11.0.20 +3.2.4 + 4.1.0 +12.0.7 4.1.108.Final 4.5.14 - 5.12.0 + 5.12.2 2.9.1 10.1.18 4.0.3.Final 2.10.1 9.10.0 -4.10.0 +5.0.0 - 1.9.21.2 + 1.9.22 5.17.0 2.1 2.31.0 diff --cc parent/pom.xml index c3bec55f49,223bee279c..1f284e308c --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -91,8 -91,8 +91,8 @@@ 2.31.2 2.12.3 1.8.0.Final - 3.0.0.Final + 3.0.2.Final - 1.9.21.2 + 1.9.22 3.25.3 [3.0, 4.0) 3.0.5 @@@ -213,13 -211,13 +213,13 @@@ 2.0.12 2.2 2.3_2 -3.0.13 -3.0.6 +3.2.4 +3.2.2 spring-test -6.1.8 -6.0.18 +6.2.3 +6.1.5 1.8.3 - 5.12.0 + 5.12.2 2.2.21 2.9.1 10.1.18
