[cxf] branch 3.3.x-fixes updated (c1a5846 -> e61e481)

[re...@apache.org]

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

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


    from c1a5846  Recording .gitmergeinfo Changes
     new 1c07d55  Update to RxJava3 3.0.8
     new e61e481  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] 02/02: Recording .gitmergeinfo Changes

[re...@apache.org]

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

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

commit e61e481d1b014f01b366df7d1cf2f77c8a400962
Author: reta <dr...@gmail.com>
AuthorDate: Wed Dec 2 21:35:39 2020 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index ff81165..9000b5b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -544,6 +544,7 @@ M 7b50181ebc445bb84d3463b284643432399bc0f8
 M 7c6bf1a843f2d4860d1bd7541139911ad47c7964
 M 7c6c2ed277fc678d8c2485a8e661cb44eb6a4d11
 M 7cfc8d07e1175c35877e7368f020db0749a78fab
+M 7da863a6c524aae01d18d6fab78f789e6ba85bf0
 M 7e1bc67acf02fe6049a4bfb7e13fe6933e618ae8
 M 7ef814556d727c147d6f625cbb1170edfd24a752
 M 7f733555945f1faed66b0b6163d24889d4cf60fc
@@ -564,6 +565,7 @@ M 9c2721f27e9697fa0f515e0787f75c26077d0572
 M 9c37b6c321f06621334076cc61b5b31b237f634d
 M 9c462e9bd614d529f0a2fd86490243ea1c858651
 M 9c6958cee3e57912b07cd3907b3aa649e797b29f
+M 9df9b22a4032b19ea953600ebdfa84e8c15d2370
 M a0f76d634d9b58a2644bc01532d7dd87b66081de
 M a3682d5fefddc8daaa068e0afe98ec6070da7dd4
 M a4fc3a0462f09dd6c6c920385b67e621d7e36399

[cxf] 01/02: Update to RxJava3 3.0.8

[re...@apache.org]

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

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

commit 1c07d5572e47255d5b896b6f6d5a3fb599d9b683
Author: reta <dr...@gmail.com>
AuthorDate: Wed Dec 2 21:32:00 2020 -0500

    Update to RxJava3 3.0.8
    
    (cherry picked from commit 7da863a6c524aae01d18d6fab78f789e6ba85bf0)
    
    # 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 a0869df..92904e3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -182,7 +182,7 @@
         <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.rxjava3.version>3.0.7</cxf.rxjava3.version>
+        <cxf.rxjava3.version>3.0.8</cxf.rxjava3.version>
         <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
         <cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
         <cxf.servlet-api.artifact>javax.servlet-api</cxf.servlet-api.artifact>