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 23:12:16 UTC
[cxf] branch 3.3.x-fixes updated (c45e5f0 -> 581f13a)
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 c45e5f0 Recording .gitmergeinfo Changes
new ddfeba4 Update to RxJava3 3.0.13
new 581f13a 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 | 2 ++
parent/pom.xml | 2 +-
2 files changed, 3 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 581f13a7342f3126ef2cf5c5cf590c3ef1807a52
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Thu Jun 3 18:55:24 2021 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 74a30e5..f2e053d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 00aac546bc3288a39edaca94f921737cdcd6653a
B 00f9a5fcf9ccfa1212b84ff0a83392a96b29836a
B 01106a1171fd53c5077cbae74143e1421977d91e
B 02186aebad9329afdcd5fcfcb74d5174f4e8d738
+B 024a38fcf44937d5174f54e4770069e8257f77b1
B 02782356b3b2d0a8bc321667851a0f441784fb9a
B 0298be286acb8e61047ecfd8c31171524a4b6728
B 046443fa88aa8883258b04e5763d0e38996c8d93
@@ -961,6 +962,7 @@ M f2db0305bb77f3d54b493ed54ea926a614b26e20
M f315acdde42f967102c7503d46d1edbb3affc210
M f355b9b3ec8b6f77198baefa051bd817807e5a94
M f3e2a52faec1210b1a45eaa36e3812ca03a4969d
+M f401076b1c98fe0d43865f1ea633301725866f8c
M f4a82cd5ebf2675085e7aa48bbcd10b50b1dd337
M f4a9d3152c23c12c6e4d63d6a8ba328d0778f3a0
M f53cbdda0c7c48b82d09b0d0f851d9938b689bea
[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.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ddfeba46836a6effcf100ee454d8f5b93afd152c
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
(cherry picked from commit f401076b1c98fe0d43865f1ea633301725866f8c)
# 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 3e57ee0..74af88f 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.12</cxf.rxjava3.version>
+ <cxf.rxjava3.version>3.0.13</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>