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 2020/10/07 01:45:13 UTC
[cxf] branch 3.3.x-fixes updated (cbc6efb -> d65c59f)
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 cbc6efb Recording .gitmergeinfo Changes
new 149ca87 Update to RxJava2 2.2.20
new d65c59f 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 | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
[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 d65c59ff91d4c024c6b87f385904b30d7598a24a
Author: reta <dr...@gmail.com>
AuthorDate: Tue Oct 6 21:44:47 2020 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index de54fab..6f75f9a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -464,6 +464,7 @@ M b9732e5a2d4cead834af8246a35b863aa7b8c811
M bbf08b76836c3d4c592d91ee2039317332599b8e
M bf1b85003e89c4b3e28384f0de476cf0e5b1af12
M c1b729ea9f0c43e6560099dbc427751fe33ee088
+M c673affb1cc40a38953dd9ce6b567705fa6eef46
M cbc0fde7f85d01e379e40a7f27fe5cea20169ddf
M cbeb9a21ba4a46f1861851f5bc56ee90d89a2225
M ccb743e48e9ed99e240ae05f373b6ff799085049
[cxf] 01/02: Update to RxJava2 2.2.20
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 149ca877c2bdd5aee328f3ff1a15282f2cda6074
Author: reta <dr...@gmail.com>
AuthorDate: Tue Oct 6 21:33:23 2020 -0400
Update to RxJava2 2.2.20
(cherry picked from commit c673affb1cc40a38953dd9ce6b567705fa6eef46)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index aaa148b..aea8571 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,8 +181,8 @@
<cxf.reactor.version>3.2.20.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.19</cxf.rxjava2.version>
- <cxf.rxjava3.version>3.0.2</cxf.rxjava3.version>
+ <cxf.rxjava2.version>2.2.20</cxf.rxjava2.version>
+ <cxf.rxjava3.version>3.0.6</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>