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/04/09 13:35:39 UTC

[cxf] branch 3.3.x-fixes updated (cd8c352 -> 5f44cc4)

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 cd8c352  Recording .gitmergeinfo Changes
     new 88aa613  Update to RxJava3 3.0.12
     new 5f44cc4  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] 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 5f44cc4c5ad98b06102d29035c0a6adc706902ce
Author: reta <dr...@gmail.com>
AuthorDate: Fri Apr 9 09:34:49 2021 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index a8d2910..13f00e1 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -802,6 +802,7 @@ M 972a2755ca85ba86f473b0ce46f23bf6193ced62
 M 9980b0472524e1010aaf7a4a3fe5ff072270efe3
 M 9a5b4568a94a72569caf4d012a42df6ebbe02779
 M 9bb8e487235d728bb80a90e7e2f4a9433b5ef033
+M 9c1345eba2e46c508062c32e3f7abf441428f101
 M 9c17f2fb90a9929d0dc8e4f090da78547a4e7a02
 M 9c2721f27e9697fa0f515e0787f75c26077d0572
 M 9c37b6c321f06621334076cc61b5b31b237f634d

[cxf] 01/02: Update to RxJava3 3.0.12

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 88aa61332832cf0abfba0cd5122cf60a0bf0cf90
Author: reta <dr...@gmail.com>
AuthorDate: Fri Apr 9 08:08:33 2021 -0400

    Update to RxJava3 3.0.12
    
    (cherry picked from commit bc02d03afeb05380a0f0b58e6413ca8bdefcb5e0)
    (cherry picked from commit 9c1345eba2e46c508062c32e3f7abf441428f101)
    
    # 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 fedd69a..e08d141 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.21</cxf.rxjava2.version>
-        <cxf.rxjava3.version>3.0.11</cxf.rxjava3.version>
+        <cxf.rxjava3.version>3.0.12</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>