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/16 20:10:37 UTC
(cxf) branch 3.6.x-fixes updated (e68ea9a96b -> 9e0a623477)
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 e68ea9a96b Update Apache Tomcat to 9.0.96
new 8de7c9230b Bump cxf.opentelemetry.semconv.version from 1.27.0-alpha to 1.28.0-alpha (#2109)
new 561d7f1550 Update ASM to 9.7.1
new 9e0a623477 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 | 4 ++++
parent/pom.xml | 4 ++--
2 files changed, 6 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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 561d7f1550788002e409f6bc2fb3352698699c8d
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
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f3c2e681b0..366b658329 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>
<!-- OSGi related properties -->
<cxf.fragment.host />
(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 9e0a623477e670b13a1e60f813d425136d68e531
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 16 15:51:52 2024 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 491423a92f..b96a2c0a41 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -5,6 +5,7 @@ B 00bbab65e59b8f27366335aec19e50129b7759f0
B 0194b82a60d9db30c858121af8e70f7d7fa1e5d9
B 02310e95fe74c0c031f540f3284e4a9bd856ced2
B 0394808f2f31a60b41835b88d8be1628b344018b
+B 04463766f22491f7d71db81552ec5cf905f51293
B 04bc5be2435c025bf5c37975bd493405bc91f6ca
B 0776f10055c221a8d1beb6db4ac709fa9ba7a42b
B 077f37412efa7bf857c6c34b6a2defb84fc587b4
@@ -332,6 +333,7 @@ M 12c5366eb31e852770d445ab23ab12a6d3ecda8c
M 13142ef111886d12b0257cf021809a5784481d84
M 1359339d23142652298e653ee8153114221b27c5
M 137d85d477562d122cfc525ce6e7a28f8f67b8b6
+M 13a9845e131ce6b7ed8ee52b9c5edee096f7ade7
M 13b3d763721b7abb4eccd776e5fcf48dd5ebaea6
M 13b63145c3713690d77ecf6d90d73fca22b7816b
M 148b2182e5e0c900d7fe658b50502f1bdc9d21c8
@@ -423,6 +425,7 @@ M 2582f01e9e855e5007ade245c8d176c82c5508a0
M 258f21c97196c4f177d1106d0390a9517d3dbff2
M 25b191b1832f6e0bde405c6c01130be892dfa77f
M 2646abd33c542f378a33e3b9111c103c56ac036b
+M 2682840c7e20d175378704ec31b247ba31479b70
M 2698de3a12d71ce99601750bb23a5f67dcd56c3b
M 26fe3aee897bf6f9ade6c82332e42355d3e0eab8
M 27813a0523e1b4ab7cccd980ef63d7249627f4e8
@@ -952,6 +955,7 @@ M a3b103fc801bd660fe4dcc7c8c8e74cdba03db26
M a3cd8018e169bf070ffc189818ce508f21e28115
M a43799c83305ad33905d757011cb9c7cce4ee6b3
M a45257eab1333f11f7c5944508c121b8e4a20af6
+M a46a3e162e8aa3a52368ea2ccec5d73630f63588
M a4ac0d1896641ef7c417f2ad618d0fa16de051eb
M a4bdbdd4ddf9c1a202c7085ebc59fb73ef96db07
M a54e2dbe6e4dc2d74472e2db523a5290378da325
(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.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8de7c9230bbfcc2d39c7eef4fc8ad4eb38fa36e5
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)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f68fbca92e..f3c2e681b0 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.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>