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/03 15:38:05 UTC

[cxf] branch 3.4.x-fixes updated (91668c1d43 -> a3e4961577)

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 91668c1d43 Added test case for HTTPConduit's 'http.redirect.allowed.verbs' context property (#994)
     new ce8c5de075 CXF-8756: Update to Swagger UI 4.14.0 (#995)
     new a3e4961577 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] 01/02: CXF-8756: Update to Swagger UI 4.14.0 (#995)

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 ce8c5de075fc61718e692da8a94fe6d2ef026b11
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 3 09:34:04 2022 -0400

    CXF-8756: Update to Swagger UI 4.14.0 (#995)
    
    (cherry picked from commit d21fa935e85a93a64545a20d3c814e6b1afdc1b6)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit e13d35af650202c60c5f6bd1eb825f33849da704)
    
    # 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 4cb51f52d1..faa8039ca3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -210,7 +210,7 @@
         <cxf.spring.security.version>5.3.13.RELEASE</cxf.spring.security.version>
         <cxf.spring.version>5.2.22.RELEASE</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>4.14.0</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.6</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.6</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.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 a3e4961577d5d42c945d45a809ae68670f60f34c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Sep 3 11:37:52 2022 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 7f7d62691d..b2f9c9775c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -149,6 +149,7 @@ B ce2528639b1caf8dffc5d93fa26156481f003f2c
 B cf9d1b6cd0696a1be6bcfcc99ee7a4676d4d7e41
 B d03b70362b2053a6e529250a0a2e5d102a5a198d
 B d1e39f84005235533212920295314b8347a70b9d
+B d4acd95ffae200d6020b66cf8ac916ecca37fc52
 B dc2b6cc5cc1164f6bb45049bec2373032411f54a
 B dedf304666956cd72cdcd7948df2e1736f260ce9
 B df1c14e0f6d2246177c9f01762e19107e79c4393
@@ -460,6 +461,7 @@ M dff229c0f97a9847310df16abefe8076ad8bfccd
 M dff93aa931d7c4d671c458f63f450c0a4d5fea3f
 M e071fd24c474d37e90b23a2da3561fa2f0525628
 M e0dbc85b5b3383c48fecb97ac11608d7b8c82cc5
+M e13d35af650202c60c5f6bd1eb825f33849da704
 M e31815b50c433a91bac93871bec801c34df2ff57
 M e32cfd0329f1e0405f8b46395dbeac5c1c70dd6d
 M e3bac521f80ebca0fa734d44e49310b1d1d7315f