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/05 19:39:51 UTC

[cxf] branch 3.5.x-fixes updated (0687e6ff56 -> c74d170998)

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 0687e6ff56 Updating to Tika 2.5.0
     new 763f1275f2 Update Swagger UI to 4.14.2
     new c74d170998 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 ++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)


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

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 763f1275f2d1d87ccb6ace4bf0601deb3eca9f9b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 5 15:09:13 2022 -0400

    Update Swagger UI to 4.14.2
    
    (cherry picked from commit 0007353d751a67c94489a9f4649b00879b3db674)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit 410728df7c306a759afb74e51c609ccac86920b5)
    
    # 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 d4c3c025bd..6ed8278b7c 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.82.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>4.11.1</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>4.14.2</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 cf23f51356..a6437d46dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -207,7 +207,7 @@
         <cxf.spring.security.version>5.6.7</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.14.0</cxf.swagger.ui.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.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.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit c74d170998f0dab4a8e40be586dfb2197ed63f7a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 5 15:26:58 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 929786e9ff..32bc7fb12f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -47,6 +47,7 @@ B c122fbdd9e1923cdb4daaef16f2e0fd65e2498b6
 B c734a65aa20fa6d56464758f019c4eb995234688
 B c87e69e5d3f1f1cd24ed37d3ba2b2fef6b294f90
 B cad4f0b76bb79f82a5ef4bc7e435e93996eb884b
+B cedaa7ee3302717bd9ca44b2996655c437d7a67c
 B cfca13411eb72d2d07ca243e24ced6e9743e6124
 B d30602dda6a86c80c58aa7665f1f6ac11b94845d
 B d319f8a2f5ca93e7bcaa028f8026c402e1046037
@@ -75,6 +76,7 @@ M 38a09d0b606f5dc0aa3a477791af76fd6f1c0cb6
 M 3d71fe88f5d9649f3b770598b5b170cb6bc8871f
 M 3e83c742e89621b37b4668768918e90b966d17b6
 M 40d34074f87d33e430e1cf0234f3362ffa00b091
+M 410728df7c306a759afb74e51c609ccac86920b5
 M 51a65beda38602ff008c032aa406208df8648422
 M 5566cc4600827e08fda454c5644b9ec81251fbba
 M 56a61325089695721be79eff8afec02095d98783