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 2024/03/14 01:07:41 UTC

(cxf) branch 3.5.x-fixes updated (0d0ea98e6c -> 1537239369)

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 0d0ea98e6c Update Project Reactor to 3.4.36
     new a0e39513d4 Bump org.webjars:swagger-ui from 5.11.8 to 5.11.10 (#1743)
     new 6e5f054aa1 Update Tika to 2.9.1
     new 1537239369 Recording .gitmergeinfo Changes

The 3 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                                 | 4 ++++
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)


(cxf) 01/03: Bump org.webjars:swagger-ui from 5.11.8 to 5.11.10 (#1743)

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 a0e39513d4c6103884ff3972d53d0418133367a3
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Mar 13 12:13:35 2024 -0400

    Bump org.webjars:swagger-ui from 5.11.8 to 5.11.10 (#1743)
    
    Bumps [org.webjars:swagger-ui](https://github.com/webjars/swagger-ui) from 5.11.8 to 5.11.10.
    - [Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-5.11.8...swagger-ui-5.11.10)
    
    ---
    updated-dependencies:
    - dependency-name: org.webjars:swagger-ui
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit c95efd4bafcd8cca67804b74d133604727786803)
    (cherry picked from commit a2451d1b820767d14f4b06def965a500583639eb)
    
    # 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 8dee938ac6..4a3fdf5a19 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.54.v20240208</cxf.jetty9.version>
         <cxf.netty.version>4.1.107.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
-        <cxf.swagger.ui.version>5.11.8</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.11.10</cxf.swagger.ui.version>
         <cxf.tika.version>2.7.0</cxf.tika.version>
         <cxf.tomcat.version>9.0.85</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 356b662e1a..81d958351d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,7 @@
         <cxf.spring.security.version>5.6.12</cxf.spring.security.version>
         <cxf.spring.version>5.3.32</cxf.spring.version>
         <cxf.stax-ex.version>1.8.3</cxf.stax-ex.version>
-        <cxf.swagger.ui.version>5.11.8</cxf.swagger.ui.version>
+        <cxf.swagger.ui.version>5.11.10</cxf.swagger.ui.version>
         <cxf.swagger.v3.version>2.1.13</cxf.swagger.v3.version>
         <cxf.swagger2.version>1.6.11</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>


(cxf) 03/03: 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 15372393697275965789b3ac3cc23ce8838c24e9
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Mar 13 20:58:34 2024 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1a97e19dc9..721d201e3f 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -123,6 +123,7 @@ B 44b60ff6a49811ebfe2cd94b6aff64e785bd3767
 B 450be91e2fa03528baae61006a188d3624c19565
 B 45188882b192a65b2572274ebc7faad677ecb554
 B 453287d2990a2b417b498ddf178f05d6b5e475da
+B 457d7f6d46401139584d1f5ce33987f0465b8802
 B 45f87b690fb702336e751bfba0dc1c4d317780d3
 B 46e87b513336b785b12c036dd3b071c073913616
 B 477cc4000f2fc7ed9ec61fb6736a09163540d19a
@@ -461,6 +462,7 @@ M 096e96e0da4ef08c0d81ff859224540045fe5caf
 M 09cdb2f16ffaf56fa76d3bee5624cc8d0c53711b
 M 0b9a55685abc679afbe6905a95b3a96abced57bb
 M 0d148c31a6264884878d5cc82d972af4046e15d1
+M 0ef213c580b7aa33bd2bb6b2be8a0d1d87de8f05
 M 0f2b22f554f402cbd19327194cccd33963686ba7
 M 101afcaf01814ac166f6091eb76bb9b18a96fff9
 M 10c6232ee9af28bbea549433f5c6e64af470fc1d
@@ -735,6 +737,7 @@ M 970a061cbd24ce19f93368eec0d32998b2cc504a
 M 97dc25412eac3342f643ea5faa38c9718d2139bf
 M 980ebec9b4e3cb99c0386ba3c795cad21e924ac7
 M 982a7acf559e3e378555b599970626d32bffdb4c
+M 98568f3e12bd98d036aa92724116a4ad7747b727
 M 993e5bd9e9980fe4afeefe2c8880919fa497ba32
 M 99a3b2ce160848b6dd4eafc2cbca9e4a3467b5f3
 M 9a8b2c051c3cd9381398915a9069e8faf48dc887
@@ -751,6 +754,7 @@ M 9efdd3ece67ca3f3f29b56c1388614ce0124aa95
 M 9f1c04b14ba55a88f77204380626c3aafaf6d56d
 M a076962fce54c361c8abb18f98856ab62ba8a4c1
 M a20d339d43db027b9d92324ecd715ee87e657e48
+M a2451d1b820767d14f4b06def965a500583639eb
 M a26dea8c265b43da8b766d314bb2d42a6896674c
 M a44c0f50b9d451b9f6201602722297f5b132b1dd
 M a49390ca95dfc21f280ee7068efc1f90089d92df


(cxf) 02/03: Update Tika to 2.9.1

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 6e5f054aa1f6e08ad33156d0c5371a466dc0613a
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Mar 13 12:27:34 2024 -0400

    Update Tika to 2.9.1
    
    (cherry picked from commit c57b7577645225c6545e22c608c9a1525b252a53)
    
    # Conflicts:
    #       parent/pom.xml
    (cherry picked from commit 0ef213c580b7aa33bd2bb6b2be8a0d1d87de8f05)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 81d958351d..efc4474053 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -218,7 +218,7 @@
         <cxf.swagger2.version>1.6.11</cxf.swagger2.version>
         <cxf.swagger2.guava.version>31.1-jre</cxf.swagger2.guava.version>
         <cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
-        <cxf.tika.version>2.7.0</cxf.tika.version>
+        <cxf.tika.version>2.9.1</cxf.tika.version>
         <cxf.tomcat.version>9.0.85</cxf.tomcat.version>
         <cxf.tomitribe.http.signature.version>1.8</cxf.tomitribe.http.signature.version>
         <cxf.undertow.osgi.version>[1.4,3.0)</cxf.undertow.osgi.version>