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/06/12 09:20:11 UTC

[cxf] branch 3.3.x-fixes updated (d801122 -> 6eaf62f)

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 d801122  Updating Spring Boot to 2.1.15
     new 872c10e  Updating Jetty to 9.4.29
     new 6eaf62f  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 +
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[cxf] 01/02: Updating Jetty to 9.4.29

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 872c10e8a064a0d608f40c18549c9220aeb67844
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 12 08:39:57 2020 +0100

    Updating Jetty to 9.4.29
    
    (cherry picked from commit 7f733555945f1faed66b0b6163d24889d4cf60fc)
    
    # Conflicts:
    #	parent/pom.xml
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 684cd7b..346d95a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -148,7 +148,7 @@
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
-        <cxf.jetty9.version>9.4.28.v20200408</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.29.v20200521</cxf.jetty9.version>
         <cxf.joda.time.version>2.9.4</cxf.joda.time.version>
         <cxf.johnzon.version>1.1.13</cxf.johnzon.version>
         <cxf.json.api.version>1.1.4</cxf.json.api.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 6eaf62fde43c83a06581bd67420833d3cd4e07c9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 12 08:41:30 2020 +0100

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 970a50c..cbaa9b7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -299,6 +299,7 @@ M 7a655b49fd6d432127a55b38f15c1212f7064196
 M 7aa6e0a402b8ce7dfff8a931a507b884d7152cea
 M 7b50181ebc445bb84d3463b284643432399bc0f8
 M 7ef814556d727c147d6f625cbb1170edfd24a752
+M 7f733555945f1faed66b0b6163d24889d4cf60fc
 M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
 M 8b11d6b26369650e5f4c6f3730dbb97d60927d9b
 M 92a00fc05e2437d2d0cf98099060ba4e1f6dac99