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/10/17 01:09:47 UTC
(cxf) branch 3.5.x-fixes updated (06bda7cf16 -> 0dba603490)
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 06bda7cf16 Recording .gitmergeinfo Changes
new 172ce046e4 Bump cxf.opentelemetry.semconv.version from 1.27.0-alpha to 1.28.0-alpha (#2109)
new afd2252b07 Update ASM to 9.7.1
new 0dba603490 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 ++
parent/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
(cxf) 02/03: Update ASM to 9.7.1
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 afd2252b07b87aef596f2f5e667a2195d43abede
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 16 09:22:56 2024 -0400
Update ASM to 9.7.1
(cherry picked from commit 90f828c9f84379f67135cb31d826cc1ecc3d18a6)
(cherry picked from commit 2682840c7e20d175378704ec31b247ba31479b70)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 561d7f1550788002e409f6bc2fb3352698699c8d)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 57c58e3677..e2305ce239 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -56,7 +56,7 @@
<!-- stuff related to ASM -->
<cxf.asm.groupId>org.ow2.asm</cxf.asm.groupId>
<cxf.asm.artifactId>asm</cxf.asm.artifactId>
- <cxf.asm.version>9.7</cxf.asm.version>
+ <cxf.asm.version>9.7.1</cxf.asm.version>
<cxf.osgi.asm.version>[3.0,10)</cxf.osgi.asm.version>
<cxf.easymock.version>5.3.0</cxf.easymock.version>
<!-- OSGi related properties -->
(cxf) 01/03: Bump cxf.opentelemetry.semconv.version from 1.27.0-alpha to 1.28.0-alpha (#2109)
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 172ce046e4ef95ef5225e3cbf6b7bdfd72d280b7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Oct 16 07:32:17 2024 -0400
Bump cxf.opentelemetry.semconv.version from 1.27.0-alpha to 1.28.0-alpha (#2109)
Bumps `cxf.opentelemetry.semconv.version` from 1.27.0-alpha to 1.28.0-alpha.
Updates `io.opentelemetry.semconv:opentelemetry-semconv` from 1.27.0-alpha to 1.28.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)
Updates `io.opentelemetry.semconv:opentelemetry-semconv-incubating` from 1.27.0-alpha to 1.28.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
- dependency-name: io.opentelemetry.semconv:opentelemetry-semconv-incubating
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 65eb26a2162112a602e951e0a3d5e9907ad957e0)
# Conflicts:
# parent/pom.xml
(cherry picked from commit 13a9845e131ce6b7ed8ee52b9c5edee096f7ade7)
(cherry picked from commit 8de7c9230bbfcc2d39c7eef4fc8ad4eb38fa36e5)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 94de678da9..57c58e3677 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,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.26.0-alpha</cxf.opentelemetry.semconv.version>
+ <cxf.opentelemetry.semconv.version>1.28.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>
(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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0dba60349095c1be4a537f6c0441f5caf3909f53
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 16 21:03:14 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 72a87ce0da..e73577e34c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -323,6 +323,7 @@ B 9ddadcf383a5550b053e2398792993b99b552402
B 9df8b7373946cc71a7b75ca5c42b4a54103fcc2a
B 9dfd633b251479e76ab4a912ae24bb90263e2328
B 9e053e21bcd21db34460c89243c82f105555e790
+B 9e0a623477e670b13a1e60f813d425136d68e531
B 9e69dfab4276855a79f65ba57dcebbd853043ecb
B 9e81dd7676ca0e6621a32d8917a9669e1bdf011e
B 9e9b26643944dbf2e1cebd5b9835c3f99aae4ff8
@@ -734,6 +735,7 @@ M 54b55ac35a101af792f3aa8e1598a200ef704c9e
M 54f65e5b70deb43bd27a2a5ed728377afca54c8c
M 5552147767fc7d89f502bd46c6f6de5338aaa1d8
M 5566cc4600827e08fda454c5644b9ec81251fbba
+M 561d7f1550788002e409f6bc2fb3352698699c8d
M 56a61325089695721be79eff8afec02095d98783
M 574b44aefb77baab37feab88adf1445f3b538a95
M 57829f009133dd3261fc11dd660426043a6e7e2c