[cxf] branch 3.3.x-fixes updated (0b96147 -> 9dccd81)

[coheigea]

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 0b96147  Recording .gitmergeinfo Changes
     new 23a18d0  Update Jetty to 9.4.37.v20210219
     new 9dccd81  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  | 3 +++
 parent/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

[coheigea]

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 23a18d041b45e91e8450192eee3c2fd1153b25d0
Author: reta <[hidden email]>
AuthorDate: Mon Feb 22 20:31:44 2021 -0500

    Update Jetty to 9.4.37.v20210219
   
    (cherry picked from commit da8b11585ed2eca131a8c12bcad3e838f3f4434d)
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e22be40..53f0809 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.36.v20210114</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.37.v20210219</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>

[coheigea]

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 9dccd81921d9906bb610e847e8143d01e38bfed6
Author: Colm O hEigeartaigh <[hidden email]>
AuthorDate: Tue Feb 23 11:53:39 2021 +0000

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 2ee55c0..20ca719 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -94,6 +94,7 @@ B 2f4a36ea8ab2c23b8ccfd9522a948b5aca3fe39c
 B 2ff8c81f9f4a2f8b62f449f3241ea26dabba6a50
 B 30ccec8572016e266b3ab2d134e90828ece79f85
 B 314b148a9b6e80d743d92cad4d56991623386980
+B 320534fa741aa00834c1d35a46efd3eedeb7229a
 B 324e838b6faf233f9d0c5b2ad618cbe92c39bbcf
 B 331342782e654235803406a5d80cd38f7a88a2b9
 B 3332e7438116940c7d7db3467c02e072ecdff826
@@ -452,6 +453,7 @@ B ec8c4448f701e47c0424bc08c8a51feb90c98c6e
 B ed504c80c0d40f709566b0b485e4bce7affff504
 B ed7a42e8262ac66b50a33bff0f3c21d8a0f559b4
 B edce9a39c0d0c87e1691e0fcf5d357623d0ae2b3
+B ee2e5ee16fe802cc1f4010b59b73c5ef53777429
 B eec13f495ec1207da93d8373531cdb3c0605781a
 B ef53e68a21747a39198db22a3dbf804512fbebab
 B ef7f9b1d16ec71ea1186701e20818607ce7d2bba
@@ -671,6 +673,7 @@ M d5b612c220bab496c3dab1731e56b3fea36c1b07
 M d8619b13cd9ff375590946c1349f6fe374959f30
 M d875ceee917237f5c344df989947aff025d45d4f
 M d88202133e39bebdb966b6ccfed57e1ff9d73638
+M da8b11585ed2eca131a8c12bcad3e838f3f4434d
 M dca1f9a88bbd11f52cc565f4ae4bc61372ecc53b
 M dccf38113b9a3566b0c2360ea2e129694938639a
 M dde79e4471e12ab53dd87a0d2adee105c57b0a71