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 2020/06/12 11:28:42 UTC

[cxf] branch 3.3.x-fixes updated (6eaf62f -> f21c053)

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

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


    from 6eaf62f  Recording .gitmergeinfo Changes
     new 4b21300  remove unused org.apache.xbean:xbean-spring
     new f21c053  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             | 24 ++++++++++++++++++++++++
 parent/pom.xml            |  6 ------
 rt/transports/jms/pom.xml |  5 -----
 3 files changed, 24 insertions(+), 11 deletions(-)


[cxf] 01/02: remove unused org.apache.xbean:xbean-spring

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 4b213003543a21e5afbd2db48c0afa4b03f5ff19
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Tue May 5 20:53:00 2020 +0300

    remove unused org.apache.xbean:xbean-spring
    
    (cherry picked from commit 3b851e904021f5cf9550df82c36ac445fd0efc30)
---
 parent/pom.xml            | 6 ------
 rt/transports/jms/pom.xml | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 346d95a..136a9ea 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -219,7 +219,6 @@
         <cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
         <cxf.wss4j.version>2.2.5</cxf.wss4j.version>
         <cxf.xalan.version>2.7.2</cxf.xalan.version>
-        <cxf.xbean.version>4.16</cxf.xbean.version>
         <cxf.xerces.version>2.12.0</cxf.xerces.version>
         <cxf.xmlschema.version>2.2.5</cxf.xmlschema.version>
         <cxf.zest.version>2.1</cxf.zest.version>
@@ -2238,11 +2237,6 @@
                 <version>${cxf.rhino.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-spring</artifactId>
-                <version>${cxf.xbean.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>1.2</version>
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index 47fda4f..9509348 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -118,11 +118,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-spring</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>


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

commit f21c0531180a18f85c4a4042f9518377125b8b9a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 12 10:54:35 2020 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index cbaa9b7..3d77d42 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -3,7 +3,9 @@ origin/master
 B 00a83132af1d549508159d503aa6b171c8607341
 B 07a8053b1ff92a1d8c59f51098b691c65d23eed3
 B 08164e1f0e07c222ae45d320973401833df6ab9c
+B 08410191bfd0133deaafa81138b74460defbd8ca
 B 0919568ba259baba9c7cfd3823516d880644804c
+B 0a961b125c0f81fc8d130ad99cc2c986e0dcdfb0
 B 0af6ac03b35075a5729023ab3b15c8daf1a55347
 B 0b1c413071a7c4c933667d6ab21e2bb51252163c
 B 0b7580839ddcd7879aa3f14576ea959a1aa872bc
@@ -28,7 +30,9 @@ B 16c1d31b17b310d32d24676d3aca9c2b80c866ee
 B 16e0e3d42fa3cb27fa289cbfe87f90855649dc32
 B 16e862032f3de1cf52a5b28e099cd35b7ce7b7ce
 B 180fbbbd5571840b5f7a09ab7c0ce59605edd346
+B 1846348f9fff03e91180f79b84957673a5bdbe22
 B 18671fba2b3f2a32e21aef43e038aa98879c7481
+B 191f35c3ec944e168b2edc0d2c679dd9d0888403
 B 1a71e4cb066071d09995f456d4a4525ffff5b9f9
 B 1bd346333d234ca3601274550d5438c41f4c38f4
 B 1c55f929bd90a5a50530b5eaf22216c93ce3f2f9
@@ -69,6 +73,7 @@ B 3fc146580f43a0d7edad85318cdb6953922bdd5d
 B 407eeb0dea157eaa0635d0c37a7ed95463b5638f
 B 4081929343f61ee4a1a54de157ba4aa713a6494f
 B 411fb51bccd3869a97e9e807f14f50ca6b1f2a10
+B 41c6c0059f6745098c6f728cd652cbafe83bc986
 B 4213f7508f14d7cc8c489981831458619418921b
 B 428a40a1aae000304642dcc6647a9f8f27a4a2c7
 B 432c6a3cbc9bb5db99a0c7822c80001338746e08
@@ -80,6 +85,7 @@ B 49337a77156dafaa0107eee775905308fdd40bf5
 B 49a3be1484462eec124524805e7439906fb18a33
 B 49d34cf3a1583932779d39766b055bf49359da53
 B 4a56c1e3444b4c8dc51e2f919439c891c63bd903
+B 4ac0628cb0ea0d87a5a3364384e8d6474fb91294
 B 4b1c1cb13fe6fa05eb27c6ad7a3393d1c3ec1ec1
 B 4ba8ca20314da9a581f1e9a17cec5f14a210f55f
 B 4bae9bec5790652c8d91fab66510ae7395c1f32f
@@ -105,12 +111,14 @@ B 62f10357e3ad98e921201fdb8e68d373d98c3f7d
 B 64584f32c8a4632344a1e062e0fc969dfd88e41e
 B 64915c3d36d6ef2bef8168e912a9b8977b5b2330
 B 65869badeefe7eedd60fbc8b7d7c614a3c6d59a8
+B 6632627f8c26c4ac488fbdafcde981684231dd9f
 B 67715076cb7d245aaf2d3a2442a40349d354e323
 B 67dbf83ef2f7a207a6374fec9775c481fe9afc53
 B 68d21206e618130aa5c0b05053a1a64e38feb2d7
 B 694741b2a1e38f20fdb80b5b9470be7772859c52
 B 6bc7f0cc09395effeaa57ee92e4b8c5dce5c00a6
 B 6c368654075cfc80a6b59903fd0ae343f2cd5fff
+B 6d41caac92d1a814db231a06f676273d3551b62d
 B 6d59a806aca3cd81e7e86df401afd771274c3141
 B 6dd6377021ac0b9b586a0c579c3adfd6950936c8
 B 6eb88763b1ca04b3a9451f994c435e5f821ca449
@@ -129,9 +137,11 @@ B 7689d884a64db0352cdb1ac9ee0628a26491f35a
 B 76a770ff0b590530d18b6f2b6cc291b31e4909e5
 B 797fa441e318dfa1214f7edaa6e090cd52095bae
 B 79dafbdce5b2d2f11e01946d794dd85eba4936e6
+B 7a91c752ef10c703c86aceebe5e22778a065a1ed
 B 7b333d06910b3d4a84dd77a3c76b48d1b44525b3
 B 7f20ddfabf5b2ed4c84b1ae6a1cac715f8d6b076
 B 80b32bb41504ecf23eaafb1d62aac8c9c3f5d405
+B 83dfabaf8773a355a867e3aa93e30989a1bbb7ba
 B 85b048e674b16541cf6a4a35ea96a7d1081faca9
 B 85ba0e6e65374df37b253f32a183b336b6d64991
 B 8723ff4f63020ba966268561b689fd9eb4349fda
@@ -178,6 +188,9 @@ B ae963c2258b8501f104387891d8de424d0ecc398
 B b2ba19a5650881cd875ce85045f188ebe115ecd1
 B b5d0c54ed4f8d647e2094807f54470ada0e11c99
 B b62c25d8dd293a0bdb06fbb8592c799f9124984a
+B b68f3c61d0d8da5283931d2bb147d7da5eefe6dd
+B b7e79397c65260c59c51fb50c76a82de437abb82
+B b9f65151a91c9c87330c825811548697359402a9
 B babe9c65a752d24e959545c9484e29dfc480eac1
 B bb5ca3b0f6b2e74912f6f4ec94c36f8fc9a6595b
 B bc1848e5686a87355563e50dd12abfa38c84adaa
@@ -194,8 +207,11 @@ B c87876c488b99de32e2dfb0ace27c43ef70f647b
 B c8b20754eaeb69380e7c64aca6ada409952cbbed
 B c9a2275276c6f8099585519372c24fda1cd7c3e0
 B caf6f42bc5bc589c0bff0e8042d801bd17e08c91
+B cb0ece06e7252debc22b430872b5ef55a0fe315b
 B cb337b70ecd746b728b18f740fe794be613c5f8f
 B cc4ea93826655c45eb5dd65290300ee42fe8d596
+B cd2e92367208b3e2a5d2f0b7dbe8328e72a5cf11
+B cd7cbb3aec02654cdd7e891e9e17ef2c0f70888b
 B cdf7685cf7a7583ee076e97706d82d5271f582b1
 B ce23b6688cbb6f88f575a8471e9ce84dfb534bc5
 B d076d4494d96d268a196d4d48602b36d7086680d
@@ -204,15 +220,19 @@ B d334b46e36d58d3b08b678baefa22f0f09ca34c2
 B d34a270473c308bd8f51d4a518ea7933a1db4e46
 B d4d4b1e740a48103811e33094adb19d5c22ca108
 B d5b7fbe585c959007adb5916ddd85350b9dd6f03
+B d6747e93b419e21812d616350ab50ae452fd61cb
 B d76454eb24afc88464dd66772fa92549b1918d26
+B d8c4e429fb5c003d63bd2f28ce376cdc9e06f5ef
 B d9fd7f1a0439d93db7d89f1ae1bc87e7b12c05ec
 B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
+B da5a3db259572196de7514d5ff807cb249d90971
 B daf7c2a073f8ae11613bc8e2f02a2225f6162d5f
 B de03dfae71010bd3719430d8d7453732f4c151ea
 B de393404c3c2e6b0f2d93f11f5fef0c53385d57d
 B de494a4f2bd3f2a99a7ddf57213bec3afe2b8300
 B df4a4d614beabd594dd04d84ea8b98db67bb361c
 B dfa8498a7b56028f0baf745d1e57eb812cbfc3cd
+B e1122ff0fc059b7a04ca42df3cd90db29b495892
 B e1b149357e40bdafe3881f9fac8dfc46f1c1420f
 B e4b7097b19388124883191bc32300ee6562849b4
 B e68d173f7d3ca15603a8f9eff9c8b39783207f70
@@ -221,6 +241,7 @@ B e6d432be93022b5b4ac1998a546d0652861fdff3
 B e73daaaa4a04c3d29c9280934a4ca7a81abb7729
 B e75756033fcb6f393fc725d13a5241c462add1d9
 B e7abc42184717e5f5e9263ce93ef026de5dd7a3b
+B ea3f552731ee18374a9deb6d3a05485c94fc70ed
 B ebd32d5301aeb630ae78dc6d488e81f2916e2660
 B ec10806f0833e004cbdecad0e308cf8c2df33619
 B ec444f3892ddcd2434b625ee606d8cc2dfb8f0de
@@ -237,8 +258,10 @@ B f2da164e0733a14f967f3726166855d3a91eece8
 B f342fba01d88d60e9f7419c7811bd86074b249a8
 B f4f227be9a1c4f31817a62fad7fff382d3089621
 B f54062eb331fcf35d9f3a840f532417fccbb2673
+B f54f4b406ec6ef5eb66c72e258a50924c851f737
 B f68556e5b8f2fb54a6e42c48068bfc3a85996720
 B f965e4917e440327abeb067c6d24ce9292f77f23
+B f9a505de281da4d626293a3def57a80b2c7006f9
 B f9c95c5d87a7b948896d8288d2009e03c6313eb7
 B f9f5d45bbe302697224128d78e8b698928a7514d
 B fa49de63402275f87d22bd0251c46f4a299d0b4f
@@ -269,6 +292,7 @@ M 330f0f9d83c5e689a8db3c107b3d27a294161bbb
 M 336d49d4e88641a6ffaf757185ff0ff93473322c
 M 375b065fa6c6fdc73b2d137654f5b60cc3464793
 M 3b119ca6630f1384b93cd718d0cd95ccabc81e91
+M 3b851e904021f5cf9550df82c36ac445fd0efc30
 M 3dfe11c866073ff93951dac2b94e0f8e8e464b27
 M 464e41a12dea11a00c86a370b31d7a7f009cb8e9
 M 4699995c6ef392a98615382a5824dda0d1bbe9bf