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/03/08 03:20:09 UTC
[cxf] branch 3.3.x-fixes updated (cbf16fd -> 3e3cc97)
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 cbf16fd [CXF-8433]JAXRSServerFactoryBean remove existing path created by other sever endpoint from destinations
new f7f4942 Update to RxJava3 3.0.11
new 3e3cc97 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 3e3cc970c0dcc93fa4d5586799d9ec344b3ce23c
Author: reta <dr...@gmail.com>
AuthorDate: Sun Mar 7 22:19:52 2021 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 5b11636..f5060ca 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -686,6 +686,7 @@ M d2f8db651c418c82b08bc69900d9b90c5d9625bc
M d37c3907c3ae94e607a8cc411f9243562637aaa2
M d5ad40bf29cf57f13aaeeca31e0aac61487095b4
M d5b612c220bab496c3dab1731e56b3fea36c1b07
+M d737196d0cd89ec04565da740f8564bcf56b25a3
M d8619b13cd9ff375590946c1349f6fe374959f30
M d875ceee917237f5c344df989947aff025d45d4f
M d88202133e39bebdb966b6ccfed57e1ff9d73638
[cxf] 01/02: Update to RxJava3 3.0.11
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 f7f49420d7cdd77d9ed2b5a4880b84a506de3049
Author: reta <dr...@gmail.com>
AuthorDate: Sun Mar 7 22:17:39 2021 -0500
Update to RxJava3 3.0.11
(cherry picked from commit d737196d0cd89ec04565da740f8564bcf56b25a3)
# 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 f22e01d..016fa9b 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.10</cxf.rxjava3.version>
+ <cxf.rxjava3.version>3.0.11</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>