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/11/20 19:51:02 UTC

[cxf] branch 3.5.x-fixes updated (1a999f377c -> 9308838077)

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 1a999f377c Update Lucene to 8.11.2
     new 58f9b26388 Update Swagger UI to 4.15.5
     new 9308838077 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                                 | 5 +++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)


[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 9308838077e338841431c9b24c6950574b8183d9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Nov 20 14:50:29 2022 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 69dacb86f8..9bbaee7fe8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 0fd59b2a26240e290fdc646decc4c5c467875f62
 B 12a68910220a3af6fe2d0419a3556320b75c3523
 B 14fde35cbb22f301217be8e1b56ef405eab70682
 B 210cd832ef91c2f95569859b45b59c846d54ff97
+B 21531a4049139798c4f4efd546235648b8084c53
 B 21afd81b648cebe854ba567cbebd22a4ce386992
 B 21bf42d906765fffb015f86d49e7b535d927bc56
 B 26aa8c8cfc103a5c51aed74a657880c6724c25a5
@@ -47,10 +48,12 @@ B 8dfb8be99b235711087c9ced02f20c24ea48d935
 B 8f7c9dae610cd708b5e17828b58b642a5485b9cc
 B 9313c2a54131b44e8f9c4332671e881bfc35a01e
 B 9723e32190d3a820e0eecf19177561155399c867
+B 9e81dd7676ca0e6621a32d8917a9669e1bdf011e
 B 9fb0bff003c4c3beecdbfbf0869804604f87f79d
 B a05b8d10d1fbeacbf3d33cfcccd302958b28ad0a
 B a6501f782cd2b392f09edb4ccb99a83acd2e75a2
 B ad496ed008ae0b0d2636bc307559749fc28287c1
+B af151eef0f4c90a9a538ca31023198c370164e99
 B b176e8e4a5a6bb6097c4e399ee0fa843f81e4b32
 B b30f428e74d86a182e8101b0de555cfa2f57d826
 B b740e0a7f606d9e5acb8c27dfb3a671708bb19db
@@ -88,6 +91,7 @@ M 16307f3833422cd93e68a694df9a872b2b08bb43
 M 1740f8741542a1567101cc15dba7608394888415
 M 1799bba4e9cc6b6220c20bff9a185afe57c2406b
 M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
+M 1e6e2ac84a703685bb402c44b687a0cd4e2bcdee
 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
 M 21131c03499c0e1f35838bf2667ef14d71b3acf1
 M 21892efb49facc7243e7284d9fd5d3ba988c3a65
@@ -156,6 +160,7 @@ M cbb59bbd3e9e4ae0259b43465fbff8b5c45991c0
 M d21fa935e85a93a64545a20d3c814e6b1afdc1b6
 M d4f4b7712b3c8c5c684fa4fa0a28758d9a27cef3
 M d849512da6499d00e3e84eb60733a0343a473b44
+M d86920ce70dfe74836f18180dc5d47c8437f0250
 M db6fcc8871fd8469907f3bfadfa6f1824e52a966
 M e272423b0ab885aa886901850360c04d11eb5ba2
 M f55be99cd50d9d1fe527bbeb55135174b7fab79b


[cxf] 01/02: Update Swagger UI to 4.15.5

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 58f9b263887ccec9a07292dbd6efc855cd4bb7d0
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sun Nov 20 10:02:21 2022 -0500

    Update Swagger UI to 4.15.5
    
    (cherry picked from commit f756c887ffd822f416d530a780d7c03f612b44b8)
    (cherry picked from commit d86920ce70dfe74836f18180dc5d47c8437f0250)
    
    # Conflicts:
    #       parent/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 17bf13b352..34af8f1634 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
         <cxf.jetty9.version>9.4.49.v20220914</cxf.jetty9.version>
         <cxf.netty.version>4.1.85.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>4.15.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
         <cxf.tika.version>2.5.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.67</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c6c88a773..9c4250237a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
         <cxf.spring.security.version>5.6.9</cxf.spring.security.version>
         <cxf.spring.version>5.3.22</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>4.15.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>4.15.5</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.8</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>