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/01/05 20:59:11 UTC
(cxf) branch 3.5.x-fixes updated (69fd9a5c13 -> 265803fc97)
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 69fd9a5c13 Recording .gitmergeinfo Changes
new bb00de07ed Update OpenTelemetry to 1.34.0
new 265803fc97 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 +
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(cxf) 01/02: Update OpenTelemetry to 1.34.0
Posted by re...@apache.org.
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 bb00de07ed41c246f7b24d770a63b4a6dd3a5434
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jan 5 11:32:34 2024 -0500
Update OpenTelemetry to 1.34.0
(cherry picked from commit f298728ae96d7bc59c964eb8dcae01b77c7b3b11)
# Conflicts:
# parent/pom.xml
(cherry picked from commit bf4bacec4aa40aa7651e0847c1137b06a6e5751f)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2dbaa0c6e7..ca381681bf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
<cxf.openjpa.version>3.2.2</cxf.openjpa.version>
<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.33.0</cxf.opentelemetry.version>
+ <cxf.opentelemetry.version>1.34.0</cxf.opentelemetry.version>
<cxf.opentelemetry.semconv.version>1.23.1-alpha</cxf.opentelemetry.semconv.version>
<cxf.opentracing.version>0.33.0</cxf.opentracing.version>
<cxf.openwebbeans.version>2.0.27</cxf.openwebbeans.version>
(cxf) 02/02: 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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 265803fc97a863cf9bc8778191d9f1dcc4e0ef05
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Fri Jan 5 15:38:47 2024 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cb7bce9061..26dad86bb7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -228,6 +228,7 @@ B 8ac5ce609c88585fbf4d96907c0a8d947153b27b
B 8aebeebbb83d5e71ec8781ab48f2f9a1906d09b1
B 8b562654da0872a100860ca699d932af3bc1e71b
B 8b77849b3b9f67a23f4264d8e80c21092e3f51c3
+B 8b9aba805051cf3a5f786dd09637233658b247cb
B 8bd2379fe2c9033e9461e51f9b5d99ab7a650978
B 8c3e3a003702fb9547519c0768806a7ce478dfa0
B 8ce40783fae5e08c0dc5fc70bf95fa0ba71572da