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 2021/02/13 17:33:31 UTC

[cxf] branch 3.4.x-fixes updated (8dfbe5b -> c7e4f42)

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

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


    from 8dfbe5b  CXF-8400: Attempt to fix org.apache.cxf.systest.ws.rm.ManagedEndpointsTest.testManagedEndpointsOneway/testManagedEndpointsOneway12
     new 1d055e6  Update to RxJava2 2.2.21
     new c7e4f42  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  | 2 ++
 parent/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


[cxf] 01/02: Update to RxJava2 2.2.21

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

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

commit 1d055e6c5c0783c4c7a28ff36849efa5d010fa4c
Author: reta <dr...@gmail.com>
AuthorDate: Sat Feb 13 11:42:06 2021 -0500

    Update to RxJava2 2.2.21
    
    (cherry picked from commit 64e772e56271ed2dd588317646e1ef0796c77635)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index c78d9cd..e7e0956 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
         <cxf.reactor.version>3.3.13.RELEASE</cxf.reactor.version>
         <cxf.rhino.version>1.7R2</cxf.rhino.version>
         <cxf.rxjava.version>1.3.8</cxf.rxjava.version>
-        <cxf.rxjava2.version>2.2.20</cxf.rxjava2.version>
+        <cxf.rxjava2.version>2.2.21</cxf.rxjava2.version>
         <cxf.rxjava3.version>3.0.10</cxf.rxjava3.version>
         <cxf.saaj-impl.version>1.5.2</cxf.saaj-impl.version>
         <cxf.servlet-api.artifact>jakarta.servlet-api</cxf.servlet-api.artifact>


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

commit c7e4f422aaf0c169422cf42e7b80c9e101c456fe
Author: reta <dr...@gmail.com>
AuthorDate: Sat Feb 13 12:33:07 2021 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index ad68d84..908a0e2 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -17,12 +17,14 @@ M 0f30442f3acb82e9936d4b486e07f5c341c142d2
 M 12a70c867e88379c520c64882ca2b261b9e9559d
 M 15185954d24578b3a848afe5bf258d9774ff03b6
 M 1820f1a94b08ba840c3868ac3e1f3b7751540a08
+M 299d6a844b99a69555355b2f9baca3e6ec13a918
 M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
 M 2f844e251362ab62923cfc6b7061591375a1cb44
 M 39ff641f3d81d8e0b9487ae8c49ac2a5bf055bc1
 M 4162189dabdb22aec54dc3c5ae93cf42b0575d3d
 M 420f6f35915cbd50cc175a6a10359125516b0213
 M 4c3c5196be3e9295c31b5bc592ebc8f911c93c6d
+M 64e772e56271ed2dd588317646e1ef0796c77635
 M 6a77819f4bc141fcddd53a36b178972f1f68fe97
 M 70c7d6a1e3f23522609d58b72b61c52e3cbc919a
 M 752a8a2dafff76ed8098cd73f1e071ffa0514754