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 22:39:26 UTC
[cxf] branch 3.4.x-fixes updated (2300b88925 -> 83b0245cab)
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 2300b88925 Recording .gitmergeinfo Changes
new 76fe08469c Update Jetty to 9.4.48.v20220622
new 83b0245cab 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] 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 83b0245cab75540be663a05c22c74a42aeb4f759
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 22 18:27:33 2022 -0400
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 81b4c55807..6486adf264 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -14,6 +14,7 @@ B 0eafad923f8d2b6eeba7fae9951450de6d368c7d
B 124fae280460ca911c6040868271328e6ca8fe98
B 1496f441b221c540c6e4260b757da09e2460e2db
B 14add09ab01626d5af2d341aabf503ab5953ce6d
+B 15d78da3b550b728ed54166536e674a5dec5083e
B 178db0d8fa34d98783d255d2beabd6e6faab4f0c
B 193718a9a0f34739dcb0cf0b13a9e680d1b9a39b
B 1b5c307b2f4cb375f436c9c1f406e099a15ef317
@@ -338,6 +339,7 @@ M a6ed23b66394b260145b08ecdd8145b647fa43e5
M a7e7e62fd3c68fa3f262bd021ae62076335c359c
M a85cfb923ce2cf72c944d8ce774de273c947ff78
M a894689ac803c234bf38a59f7d845aec4f4d70e0
+M ab533d05f066a89af2a33787eb2cc615679ec72c
M ac656dd13ac54b83aeb0c877e01dfb277d38ca96
M ad194637ee3dd22f445e34b6db72d314ee650d79
M ade1129cd94291f7fbd12cb536bc9367b19bb870
[cxf] 01/02: Update Jetty to 9.4.48.v20220622
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 76fe08469c2355093c9ddcd074ab5986144c38ec
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Wed Jun 22 14:55:38 2022 -0400
Update Jetty to 9.4.48.v20220622
(cherry picked from commit 5566cc4600827e08fda454c5644b9ec81251fbba)
(cherry picked from commit ab533d05f066a89af2a33787eb2cc615679ec72c)
# 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 1d6390b02e..05c82b9879 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.47.v20220610</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.48.v20220622</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 518fefce4c..5e302f303e 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.47.v20220610</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.48.v20220622</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>