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/06/22 00:52:25 UTC
[cxf] branch 3.4.x-fixes updated (5596907b7f -> 2300b88925)
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 5596907b7f Recording .gitmergeinfo Changes
new e68dc4048a Update Jetty to 9.4.47.v20220610 (#965)
new 2300b88925 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 | 2 +-
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
[cxf] 01/02: Update Jetty to 9.4.47.v20220610 (#965)
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 e68dc4048a81a73386e907dbd4698eee63a8c57c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 21 20:02:44 2022 -0400
Update Jetty to 9.4.47.v20220610 (#965)
(cherry picked from commit 53b3719fb77a11f5dde71741deec1f84682058ef)
# 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 908d14734d..1d6390b02e 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.3.9.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>2.2.3.RELEASE</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.46.v20220331</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.47.v20220610</cxf.jetty9.version>
<cxf.netty.version>4.1.77.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>
diff --git a/parent/pom.xml b/parent/pom.xml
index ffbe7947a9..518fefce4c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,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.46.v20220331</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.47.v20220610</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jexl.version>3.1</cxf.jexl.version>
<cxf.joda.time.version>2.10.10</cxf.joda.time.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.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 2300b8892549cb9cf0c8e6c64ababc246f7ca02c
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 21 20:52:14 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c4f3b8da45..81b4c55807 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -235,6 +235,7 @@ M 51d876408746af1ada48c6f16fb2df13fc9590e1
M 52ae98b551cd9e68cfc00aa3518cddbd852cb700
M 52c993ae6e74fee283180b15cc0a2bf98b67732b
M 531a1871253cfb1adbf4def72d055b9f1efed646
+M 53b3719fb77a11f5dde71741deec1f84682058ef
M 5409cc649fa5542e0f68af24546ab05a4e38a50c
M 541ec1e3bd63890a64831d2470f972bf0ed4811d
M 54538c21fac194884dad69d6543e67a9c8865bab
@@ -268,6 +269,7 @@ M 6b0c020e28c150d5913ec047c900d63bcc548f3f
M 6bce68f2019b17952069b1b516647f06fe81fea1
M 6d136a2635f0fe160bff6be1dcb8e52954dcbac3
M 6db4b5c8bbc1d9991bdce428fed2ca9f3c6d3bfe
+M 6e2e438813a653982c523d795af7bd07d251b2b0
M 6e645cb9a671c43bf61c2dd26b1363a96e94885d
M 6ebc028394e00285194405c60cfdf27928e85317
M 700cf3929763d551d9fac6c570c2560039c6238c