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 2022/09/28 00:27:04 UTC
[cxf] branch 3.5.x-fixes updated (237c71cbdc -> 1aa7f332cf)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from 237c71cbdc Revert "Fix ws-discovery-api test on MacOS on M1"
new 6919824e0e Update Swagget to 1.6.7
new 1aa7f332cf 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 | 3 +++
parent/pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[cxf] 01/02: Update Swagget to 1.6.7
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 6919824e0e892f3da69ccb9cbe471f318ec0127b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Sep 27 19:32:08 2022 -0400
Update Swagget to 1.6.7
(cherry picked from commit 9031457c538ccfe133357ab039afb2a013a2fe82)
# 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 235b6b7b8f..5791cef780 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -209,7 +209,7 @@
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>4.14.0</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
- <cxf.swagger2.version>1.6.6</cxf.swagger2.version>
+ <cxf.swagger2.version>1.6.7</cxf.swagger2.version>
<cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
<cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
<cxf.tika.version>2.4.1</cxf.tika.version>
[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 1aa7f332cf8a94a96348b30b3a0b5c0fab53cc98
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Sep 27 20:10:00 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 73797b2d9f..624977cb95 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -8,6 +8,7 @@ B 21bf42d906765fffb015f86d49e7b535d927bc56
B 26aa8c8cfc103a5c51aed74a657880c6724c25a5
B 2c48413cfa4dbd746b49b4b08b0d15eb8077a7d6
B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
+B 3e7d45d5ff4b026dcea4e6a8196f6534750c9acd
B 44919916b3747beb059cadd95a34e0bf15202a0d
B 4b63dbb428488f3a6d0b7114632404b31458a521
B 55534e4d391793e88df3515867224f80a12b312c
@@ -83,6 +84,8 @@ M 8108bd9bdbc5ec3d00d7dad8b775eff72689560d
M 819ff756a4a0ff34a6318661854cc57a24955e8a
M 8a76536ff93dedf5b71d9d6f222323c34f3dbeb8
M 8c348a6138035882657a37b738e13b755fbe231f
+M 901da059d3d23b9956d937ae3fdbcbb81c62eb75
+M 9031457c538ccfe133357ab039afb2a013a2fe82
M 905f4f91e4d0b5c4d145729f16bad90b1847f0be
M 937d6ca1fad9e39fa9684ea62c924b461b57d177
M 96e71237bae2eb987a5fbe67d21e9e1e19f2d158