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:59:53 UTC

[cxf] branch 3.4.x-fixes updated (845ce2837b -> edf16e2ddd)

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 845ce2837b Recording .gitmergeinfo Changes
     new c66d80310a Update Swagger UI to 4.14.2
     new edf16e2ddd 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] 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 edf16e2ddd45d66303cdf4ecb3771ea27ec19aff
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Oct 5 15:53:50 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3e4013887c..29c305a979 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -163,6 +163,7 @@ B c035185add363a99fbacbeb8970dab1a7833c054
 B c24188673a00d70355ebea31b8d36f78483c683d
 B c44c39b2faed4eef057a68e38fbe743609cb6a4c
 B c58d2cd38003a90608aa04e40756c042cbaf7e03
+B c74d170998f0dab4a8e40be586dfb2197ed63f7a
 B cb0ab2cb818ed41e4790715ec8aaf982e256cf1f
 B cdd752fbc49a055f8e0e47893686af6ac70e7186
 B ce2528639b1caf8dffc5d93fa26156481f003f2c
@@ -366,6 +367,7 @@ M 7381411c96166c7320e07f9809182e060d52e7df
 M 73c22d0a0c0f98a6def324f28c4eee10bda917ea
 M 74d2a97deb62742559facb0f4693e0f65d3ace5d
 M 752a8a2dafff76ed8098cd73f1e071ffa0514754
+M 763f1275f2d1d87ccb6ace4bf0601deb3eca9f9b
 M 79cef4b00e357829bb688d4a897157235d23132e
 M 79f8c812ec3e61d5702adb5ec54f5aecb7e04a8e
 M 7a05e4fb0b67a89b86ed6eee68b9416005d6f631

[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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit c66d80310aea19276ce5fc58f4dc299afa08792d
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
    (cherry picked from commit 763f1275f2d1d87ccb6ace4bf0601deb3eca9f9b)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       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 71e2c5a621..d164b1cb14 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.14.0</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>4.14.2</cxf.swagger.ui.version>
         <cxf.tika.version>1.28.5</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 24edba900d..e96fbde24f 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.14.0</cxf.swagger.ui.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.guava.version>31.0.1-jre</cxf.swagger2.guava.version>