You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2023/02/09 07:04:22 UTC
[cxf] branch 3.6.x-fixes updated (aa74b1f2c5 -> 0d7fee252e)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from aa74b1f2c5 Fix checkstyle violations
new 011e905853 CXF-8818 - wsdl2java fails in 4.0.0 due to incorrect versions in Manifest (#1123)
new 0d7fee252e 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 | 8 ++++++++
distribution/manifest/pom.xml | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
[cxf] 01/02: CXF-8818 - wsdl2java fails in 4.0.0 due to incorrect versions in Manifest (#1123)
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 011e9058534cc1c3c4758ca3d4b7178cafef87b9
Author: Colm O hEigeartaigh <co...@users.noreply.github.com>
AuthorDate: Thu Feb 9 06:35:36 2023 +0000
CXF-8818 - wsdl2java fails in 4.0.0 due to incorrect versions in Manifest (#1123)
(cherry picked from commit 9b436cb374ca237602f657949882d5ef501098e4)
---
distribution/manifest/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/distribution/manifest/pom.xml b/distribution/manifest/pom.xml
index 425cce50e2..51c7af7016 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -320,7 +320,7 @@
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
- <version>2.3.3</version>
+ <version>${cxf.jakarta.wsapi.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -329,12 +329,12 @@
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
- <version>2.1.0</version>
+ <version>${cxf.jakarta.jwsapi.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.soap</groupId>
<artifactId>jakarta.xml.soap-api</artifactId>
- <version>1.4.2</version>
+ <version>${cxf.jakarta.soapapi.version}</version>
</dependency>
</dependencies>
<build>
[cxf] 02/02: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0d7fee252e18fe544cf54244d6638c9a30a32bd6
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 9 06:37:45 2023 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4bb8acbf2c..84ab33de3e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -9,38 +9,46 @@ B 31c8076321503aa16897701795cf334891dd1bab
B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
B 34f37609eb464b46e76f1f5d5340f9799df1008a
B 3a9583d5edf20a16dd2fa739a9fb8fbce8168a23
+B 43e1aa22d5498bc0a324fc57292e241c42e7ea0c
B 4a71fea3e7a826f8022bf59b113b1a27649f370e
B 4b63dbb428488f3a6d0b7114632404b31458a521
B 517c8c2ba083e884125d153be02482101bd7dc72
+B 56667a4295c0e1a9694fc9d6a943447d0f39a575
B 58ae0ed63c9361ad5e9591c5cf8bf6f34d1649fd
B 6d3286cb9fa4810d5ad8e24581fb6bddf800f584
B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
+B 7dca49b11f913ff0cbbde40153fc52cd6bcc0aa1
B 7f4c668a04211e044c69fe51c0053567e39a13d6
B 7f683ba748e2133af0f93f1d77df5921b4e86011
B 853facf1466661d74ccce985926063ed12d3a9d5
+B 89a19d577262ac534cf2c0f03ef6776b27903dbc
B 8e53636903d430a72e4fb98aa07a6359eb509901
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B 9723e32190d3a820e0eecf19177561155399c867
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
B a7bdc11a62b1810b436ce70e60fcc252ab41337d
+B acb1230211b4498733b6d5307eaf1c29ea8c8822
B b067ecf705094a7b66a98639465c38f2a55f7d15
B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
B b62b400e2625649076479c406657406072695bb9
B b63755a5ba795f0f2d95a10a31c8f7beeec74602
B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
B ba839e6b1f3ee5c26fd600834ea10227dd4cc317
+B bd82d8a346cc766ee86034993c6f589ef0623d79
B bdb88222f4de2d57d74a61e0850f1843ceed73c8
B c13973ea10119518e29d1e4b68f8a376a2c50352
B c2760bd0a4776fa61402349af7bc94c3bd050873
B c2a879df66b70c02e4196ea11861c43fe92ac7c3
B c4ae7ea784051f36b6a79bfc4cc0e7de6c3a9881
B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b
+B cd2a2a2f6663c5c401f1a7ba35e520503edc2e94
B cfca13411eb72d2d07ca243e24ced6e9743e6124
B cfe9f430ee617552eb743140cb78cc5df4c4eb83
B d31e1a35f56b28c7c06800364434b10aee90ce24
B d77fd3ac9eb11bd69e5d534dffe53296e4c00ae8
B e476d83ee9ca5c01d6098a14bd4d5d9bc847eca7
B e7157bb371804a15e3c78351c9b506776bcbdeda
+B f3e15e52c7d27d5734d3716dc3beb9a19f879387
B f8d9f35ba6986a13fb65eadd50b701b7cbf70113
B fd2d04c9e6d53577887d479a701404d7e478458d
B ff995172b7a80ea31c9e944011dce331dc138a29