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 00:35:56 UTC

[cxf] branch 3.4.x-fixes updated (20b1160ad0 -> 6ef4b53683)

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 20b1160ad0 Fix SortedArraySet remove, containsAll (#1003)
     new 8c1ad0d643 Update Apache Tomcat to 9.0.67 (and update samples dependencies)
     new 6ef4b53683 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 | 8 ++++----
 parent/pom.xml                                | 2 +-
 3 files changed, 7 insertions(+), 5 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 6ef4b53683688ae55c197bac87040f4318ce45a2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Oct 4 20:26:56 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 61b8720499..7f493690c8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -154,6 +154,7 @@ B b756a926aad920c977c16fe6df469630b189d1b6
 B b88bbda9b0ebd41af1f00909e553c92055d9cfa5
 B b902794f187035a6efe39e3632ccc7be0adc8a89
 B b913b8d366af27a07d5c9cb80f10bf7fbf0ee5f2
+B bad8f7cfb19b041e71875e45408902f616e691b2
 B bbfd114ccc7bdbe9c09f1048a8fac13ece19d61e
 B bcde2712f577c400c03d6acf8c33877510505e0e
 B bfd64d8112f211ed3c2409d8b1b04355ce75c8bc
@@ -212,6 +213,7 @@ M 049ed3c49a05f9997111afd66ba583dc2b4630f2
 M 04c73ab64486b3806c3cc78d5196d2c52280ca89
 M 08c49b245145c5e5d9954b0a17ca55920cf13908
 M 0903bdd2f5f91de71425dedde8c5d7fbf44d297f
+M 09799ee9a7930335df62e3f908805b946cbb04a3
 M 0b137e22f2213a06b5325a0ef9d52b8a94829161
 M 0c12c2611f3fe07666d5ec6332075246038ec11f
 M 0c609dc1e242e4156ad55e10fa0699636da02ee9


[cxf] 01/02: Update Apache Tomcat to 9.0.67 (and update samples dependencies)

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 8c1ad0d643fb32f8c49b92c498c1b877cf43faeb
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Oct 4 19:52:13 2022 -0400

    Update Apache Tomcat to 9.0.67 (and update samples dependencies)
    
    (cherry picked from commit 1799bba4e9cc6b6220c20bff9a185afe57c2406b)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    (cherry picked from commit 09799ee9a7930335df62e3f908805b946cbb04a3)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
    #       parent/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 8 ++++----
 parent/pom.xml                                | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index a28ae0d11b..71e2c5a621 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,12 +32,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>2.3.9.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
-        <cxf.jetty9.version>9.4.48.v20220622</cxf.jetty9.version>
-        <cxf.netty.version>4.1.79.Final</cxf.netty.version>
+        <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.0</cxf.swagger.ui.version>
         <cxf.tika.version>1.28.5</cxf.tika.version>
-        <cxf.tomcat.version>9.0.65</cxf.tomcat.version>
+        <cxf.tomcat.version>9.0.67</cxf.tomcat.version>
         <graalvm.version>21.1.0</graalvm.version>
     </properties>
     <dependencies>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ec50d2de6..24edba900d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,7 +216,7 @@
         <cxf.swagger2.guava.version>31.0.1-jre</cxf.swagger2.guava.version>
         <cxf.swagger2.guava.failureaccess.version>1.0.1</cxf.swagger2.guava.failureaccess.version>
         <cxf.tika.version>1.28.5</cxf.tika.version>
-        <cxf.tomcat.version>9.0.65</cxf.tomcat.version>
+        <cxf.tomcat.version>9.0.67</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>
         <cxf.undertow.xnio.osgi.version>[3.3,4.0)</cxf.undertow.xnio.osgi.version>