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/10/19 13:16:34 UTC
[cxf] branch 3.4.x-fixes updated (13d2bf0867 -> d04422fdf7)
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 13d2bf0867 Recording .gitmergeinfo Changes
new 4068350df8 Update Swagger to 1.6.8
new d04422fdf7 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 Swagger to 1.6.8
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 4068350df82f621b375d4dbbbcf36663d9f074c0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 19 09:10:11 2022 -0400
Update Swagger to 1.6.8
(cherry picked from commit 132c8fce376a2bb08de5917207cd28531d7e2aff)
# Conflicts:
# parent/pom.xml
(cherry picked from commit c2c9598f3a3c81aad5ecec2d2f4b36a52ec50e34)
# 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 471e6738a5..9cf9343520 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -212,7 +212,7 @@
<cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
<cxf.swagger.ui.version>4.14.2</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
- <cxf.swagger2.version>1.6.7</cxf.swagger2.version>
+ <cxf.swagger2.version>1.6.8</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>1.28.5</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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d04422fdf722c146c4d40cba2a512cc645f27f92
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 19 09:16:12 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9d5947dd11..d032012ea9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -109,6 +109,7 @@ B 70f8e53b47a7e06f6f4481db2c301ee91e9b3cb0
B 75fb6bb56d82f72771a9ee6ecab5d36168303f51
B 799660ad89472302f8ac9fcdcf818f469601aa42
B 7cfda87f43d41fddb0e2d0e2501cb3918807e88f
+B 7db51c0f207a3b6a83130272fde6c75f5864b31a
B 7dcda069b57ee9732a2fb089df35c91c040527f0
B 7f49050d5a01af413486ae488594cf89b5bbe9ca
B 831df7e8403e51eac4140456b027066932ecde11
@@ -441,6 +442,7 @@ M a89cf6fbab8028ea343c6d47bb68400d123375af
M a9d29a7f2b40563f5cf74337009ae51a6a514d93
M ab533d05f066a89af2a33787eb2cc615679ec72c
M ab7d11812307d557c759180d3efdca61f51225b6
+M abe813f18d70c9275e016054d8255789a1e56194
M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
M ad194637ee3dd22f445e34b6db72d314ee650d79
M ade1129cd94291f7fbd12cb536bc9367b19bb870
@@ -474,6 +476,7 @@ M c1002628081169c9561135a55fed8851ef4b9fff
M c2244fa94cd86e1bd1068f36d9fe2f88269f2a74
M c2954529b74f216a03cad31a7fd9cd09923a10bf
M c29b1c23a7e09f9fe2c5412d0b9ece1bafb7c89c
+M c2c9598f3a3c81aad5ecec2d2f4b36a52ec50e34
M c2e6f351383602c5c40405049fb83a52a0b3ccff
M c33952dbea70f4b23ac4f8491a23b5aa13766ae7
M c4225cad3036a36f3a7f8c4a46a7633a92989a93