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:16:42 UTC

[cxf] branch 3.5.x-fixes updated (9f55067e3b -> 876323beef)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from 9f55067e3b Bump dom4j from 2.1.3 to 2.1.4 (#1122)
     new da107cef79 CXF-8818 - wsdl2java fails in 4.0.0 due to incorrect versions in Manifest (#1123)
     new 876323beef 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                 | 4 ++++
 distribution/manifest/pom.xml | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 876323beef77b81fad0094947aa646ce1cb17421
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 9 07:04:42 2023 +0000

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index d237d245e5..d9a521774f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -4,6 +4,7 @@ B 00bbab65e59b8f27366335aec19e50129b7759f0
 B 0233bbf8fb5599639978d8c60b6df12e668d7d6b
 B 026e79a86c47387ad3461210e53cd0dc0034ccbe
 B 044b280cf89fad58502cc27e66022e517d5de577
+B 0d7fee252e18fe544cf54244d6638c9a30a32bd6
 B 0da7f36a16fe1bcbcd9b2a64d0bfe2c19d5c319c
 B 0e9ba6cfe143f156721d6f8a1fd38d84946b5e8d
 B 0fd59b2a26240e290fdc646decc4c5c467875f62
@@ -15,6 +16,7 @@ B 2138d98dc708e883f638e35abc53065f99b9961b
 B 21531a4049139798c4f4efd546235648b8084c53
 B 21afd81b648cebe854ba567cbebd22a4ce386992
 B 21bf42d906765fffb015f86d49e7b535d927bc56
+B 22d817d86fb576479f6095a43d8f64521350b53d
 B 26aa8c8cfc103a5c51aed74a657880c6724c25a5
 B 2af064bc7025d815cd02ba979eeb4eccc7775a6a
 B 2b4a9f3abe30c92542e217d1077ea5c77119f328
@@ -27,6 +29,7 @@ B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
 B 3795fbc8740c882d8f276b6e9cbaf0cab107edef
 B 38582a2b8d91502cd598029104b0f87c0255d86c
 B 399a35267366297a4e2b9e7e8c53972edfa24591
+B 3c0bc31cf4f6c754c21115b83c846ca17548817d
 B 3e7d45d5ff4b026dcea4e6a8196f6534750c9acd
 B 44919916b3747beb059cadd95a34e0bf15202a0d
 B 450be91e2fa03528baae61006a188d3624c19565
@@ -80,6 +83,7 @@ B a05b8d10d1fbeacbf3d33cfcccd302958b28ad0a
 B a4c31985a4fdf040916f46ec4f23fb5e7524abc6
 B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
 B ad496ed008ae0b0d2636bc307559749fc28287c1
+B ae865c4aeb8d3ed8019fd0d23b0bbc38f0e66506
 B af151eef0f4c90a9a538ca31023198c370164e99
 B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
 B b30f428e74d86a182e8101b0de555cfa2f57d826

[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit da107cef79b55998186efafb4322c23857c8188d
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)
    (cherry picked from commit 011e9058534cc1c3c4758ca3d4b7178cafef87b9)
---
 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 38a911443d..406c8328c9 100644
--- a/distribution/manifest/pom.xml
+++ b/distribution/manifest/pom.xml
@@ -335,7 +335,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>
@@ -344,12 +344,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>