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/01/01 21:15:39 UTC

[cxf] branch 3.3.x-fixes updated (6823891 -> 8572aa7)

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 6823891  Recording .gitmergeinfo Changes
     new ad0068e  Update RxJava3 to 3.0.9
     new 8572aa7  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  | 1 +
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[cxf] 01/02: Update RxJava3 to 3.0.9

Posted by 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 ad0068eda0bfbc396e8e60718af7eb2ae00c9f49
Author: reta <dr...@gmail.com>
AuthorDate: Fri Jan 1 14:34:06 2021 -0500

    Update RxJava3 to 3.0.9
    
    (cherry picked from commit be41158d8c65b227c77d927ace7ca30c7c6dd015)
    
    # 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 eb27a74..851aaa5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -183,7 +183,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.8</cxf.rxjava3.version>
+        <cxf.rxjava3.version>3.0.9</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>


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

commit 8572aa7b7be62d12f8e7e8f109bc887221ee2ee7
Author: reta <dr...@gmail.com>
AuthorDate: Fri Jan 1 16:14:42 2021 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 040f3b5..35f4287 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -614,6 +614,7 @@ M b9732e5a2d4cead834af8246a35b863aa7b8c811
 M b9c2379c51b236b3cf09e2f7bda3ebd0f8450474
 M bb72206d0ed811a2c32012012fdc01ec973567a3
 M bbf08b76836c3d4c592d91ee2039317332599b8e
+M be41158d8c65b227c77d927ace7ca30c7c6dd015
 M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
 M c0690e1fa57e0231461c9dd644d6b3c80852eef9
 M c0ef051466d775c84ddb20a9a12025d4258fb18b