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:25:32 UTC

[cxf] branch 3.5.x-fixes updated (9aabdf3e8a -> bad8f7cfb1)

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 9aabdf3e8a Fix SortedArraySet remove, containsAll (#1003)
     new 09799ee9a7 Update Apache Tomcat to 9.0.67 (and update samples dependencies)
     new bad8f7cfb1 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                                 | 1 +
 distribution/src/main/release/samples/pom.xml | 8 ++++----
 parent/pom.xml                                | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)


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

commit 09799ee9a7930335df62e3f908805b946cbb04a3
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
---
 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 4a85fe6ad4..c235d72ebb 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,14 +30,14 @@
         <!-- don't deploy the samples, kind of pointless -->
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>2.6.10</spring.boot.version>
+        <spring.boot.version>2.6.12</spring.boot.version>
         <spring.cloud.eureka.version>3.1.1</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.tika.version>2.4.1</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 ca86b061a8..28b91f7352 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -213,7 +213,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>2.4.1</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>


[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 bad8f7cfb19b041e71875e45408902f616e691b2
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Oct 4 20:09:52 2022 -0400

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 566644312c..929786e9ff 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -63,6 +63,7 @@ M 11502cd9e0f85ded3ae83b3df7226d2e107159ab
 M 15063b0f08c66011f24f2d32352200736ee83710
 M 157e2cbef796e9fc9c9ba5c5e79bd0cd7a46692e
 M 16307f3833422cd93e68a694df9a872b2b08bb43
+M 1799bba4e9cc6b6220c20bff9a185afe57c2406b
 M 18f1791fa72dba0a7f2ed784d0dfbbb5e9923306
 M 1ecc24d817d4ef0cba4a4079a1c69abf33d1ad9b
 M 21131c03499c0e1f35838bf2667ef14d71b3acf1