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/06/03 22:54:20 UTC
[cxf] branch 3.4.x-fixes updated (172fa7a -> 024a38f)
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 172fa7a Recording .gitmergeinfo Changes
new f401076 Update to RxJava3 3.0.13
new 024a38f 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 to RxJava3 3.0.13
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 f401076b1c98fe0d43865f1ea633301725866f8c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 3 17:59:22 2021 -0400
Update to RxJava3 3.0.13
(cherry picked from commit 2b112dd1e05bd43ed25c7d77f1bc437fc976bd5a)
# 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 53f59f2..272d81b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,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.12</cxf.rxjava3.version>
+ <cxf.rxjava3.version>3.0.13</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.servlet-api.group>jakarta.servlet</cxf.servlet-api.group>
[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 024a38fcf44937d5174f54e4770069e8257f77b1
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 3 18:20:04 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 03ea0a2..04f364b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -90,6 +90,7 @@ M 1955e0d57557bd682d0e7fe6bd68d3fb973c4af0
M 1c7c39771adb05f1fa8678e20b97f1c735f2601c
M 299d6a844b99a69555355b2f9baca3e6ec13a918
M 2a1614e5be080b6749fc72d1be2c253215c1bae7
+M 2b112dd1e05bd43ed25c7d77f1bc437fc976bd5a
M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
M 2cd495719e7532657f7e8cad5b5347cedccd2de8
M 2f844e251362ab62923cfc6b7061591375a1cb44