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:15:37 UTC
[cxf] branch 3.5.x-fixes updated (abe813f18d -> 7db51c0f20)
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 abe813f18d Update Spring Security to 5.6.8
new c2c9598f3a Update Swagger to 1.6.8
new 7db51c0f20 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] 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 7db51c0f207a3b6a83130272fde6c75f5864b31a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 19 09:15:10 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index dbb0228019..621cd98722 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -41,6 +41,7 @@ B 8c3e3a003702fb9547519c0768806a7ce478dfa0
B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
B 9313c2a54131b44e8f9c4332671e881bfc35a01e
B 9723e32190d3a820e0eecf19177561155399c867
+B a05b8d10d1fbeacbf3d33cfcccd302958b28ad0a
B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
B ad496ed008ae0b0d2636bc307559749fc28287c1
B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
@@ -66,6 +67,7 @@ B fb4db130537c71d22dc912db98b9b31f7945db47
M 069f602cb56f5164d8e926f5a0dd2a11b3caf004
M 10c6232ee9af28bbea549433f5c6e64af470fc1d
M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
+M 132c8fce376a2bb08de5917207cd28531d7e2aff
M 15063b0f08c66011f24f2d32352200736ee83710
M 157e2cbef796e9fc9c9ba5c5e79bd0cd7a46692e
M 16307f3833422cd93e68a694df9a872b2b08bb43
@@ -118,6 +120,7 @@ M adfe67ca302ba3c4ddf40a734493cf75d3439b9b
M b207c718e84bed8120bb114f1d79f575094c3a14
M b3503705c584c5b29a5e4e7a64b909c3609f7529
M b5faf57b6f696c1487fc6f12795e9113f1f804a6
+M b89e493384de54e2cad06914c244bd2d3af0f563
M ba58c444dd835e105136b9eab74e5c0e9e80914b
M c3fa8f19ed721b21e1e18133e9eb20b2906a5eaf
M c4c9de9f13d3a65e3f532e2a72dc784ed3f36366
[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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c2c9598f3a3c81aad5ecec2d2f4b36a52ec50e34
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
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e0c1aa7a12..9940b3cfd1 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.2</cxf.swagger.ui.version>
<cxf.swagger.v3.version>2.1.13</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>2.5.0</cxf.tika.version>