You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/11/06 16:52:22 UTC

[cxf] branch 3.3.x-fixes updated (095b3e2 -> fb057ee)

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 095b3e2  Recording .gitmergeinfo Changes
     new a9fa808  Updating Jetty to 9.4.34.v20201102
     new fb057ee  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 | 2 +-
 parent/pom.xml                                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


[cxf] 01/02: Updating Jetty to 9.4.34.v20201102

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit a9fa8086a0eca675cc7f2e11786a1f813d14dd91
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Nov 6 16:51:23 2020 +0000

    Updating Jetty to 9.4.34.v20201102
    
    (cherry picked from commit 743ef459be7a1a7d17cb3b67780daf06eb5356c2)
    
    # Conflicts:
    #	distribution/src/main/release/samples/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 2495443..d05314d 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>2.1.18.RELEASE</spring.boot.version>
         <spring.cloud.eureka.version>2.0.2.RELEASE</spring.cloud.eureka.version>
-        <cxf.jetty9.version>9.4.33.v20201020</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.34.v20201102</cxf.jetty9.version>
         <cxf.httpcomponents.client.version>4.5.13</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>3.24.3</cxf.swagger.ui.version>
         <cxf.tika.version>1.24.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index 707f903..d83e915 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,7 +145,7 @@
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jettison.version>1.4.1</cxf.jettison.version>
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
-        <cxf.jetty9.version>9.4.33.v20201020</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.34.v20201102</cxf.jetty9.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>


[cxf] 02/02: Recording .gitmergeinfo Changes

Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit fb057ee95608822b2336fa0b1e93b9d46c6bde0f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Nov 6 16:52:09 2020 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 29c1665..6ffe1a9 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -511,6 +511,7 @@ M 6f08487b2b02d4fd4c95b232eff839c6066fa668
 M 6f79756afa8a0cf90a7132929cc387f6f1d21ba0
 M 706dd02fd37597967a10d5a5c1ad526b995f88ea
 M 727c2b8e70f6f8282ad2431703e88063f27d69c4
+M 743ef459be7a1a7d17cb3b67780daf06eb5356c2
 M 764662ff240d8f5dc09cb059d867d9e69bf761d4
 M 79466c55a2a1191df9c28a02568b82a8c3d08fbd
 M 7971b506283502c26aafb97c0f6e50633f126cdd