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 2021/06/09 09:18:23 UTC
[cxf] branch 3.3.x-fixes updated (d5a79f8 -> c9b5ae5)
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 d5a79f8 Recording .gitmergeinfo Changes
new 08a4b15 Updating Jetty to 9.4.42.v20210604
new 0779429 Updating Jetty to 9.4.42.v20210604 in the samples
new c9b5ae5 Recording .gitmergeinfo Changes
The 3 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 +++
distribution/src/main/release/samples/pom.xml | 2 +-
parent/pom.xml | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
[cxf] 01/03: Updating Jetty to 9.4.42.v20210604
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 08a4b1541eb9fb144e3f52a739e18b40eb9cc515
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 9 10:12:06 2021 +0100
Updating Jetty to 9.4.42.v20210604
(cherry picked from commit e221acbd2fc0a0f7dc652404c0ac43b6c25b6504)
(cherry picked from commit c2c2a15abff8ad591366280a2fb826afea522157)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index a4aa104..01028d1 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.41.v20210516</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.42.v20210604</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] 03/03: 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 c9b5ae5ca719c52d6a07c230b9373457a588e209
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 9 10:18:10 2021 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ba2e685..9473d0e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -513,6 +513,7 @@ B c28748596a0240f749daaddc9e5fbf2df83c10f7
B c2b7f3b3857afd5fe4e33dff35ed1992f6f4854a
B c3d825c4265754ed327980a2adc9422dd561419b
B c42d99ad5d7350eef2757ac8ffcd2efae074a941
+B c48fea7138cb2a861676406e34f934af6c3313c7
B c49b6d578e4f33df736eeec46e10950c46a9278b
B c4e2f95250b7c456ecd97c75e158311bdf4e2709
B c58d2cd38003a90608aa04e40756c042cbaf7e03
@@ -850,6 +851,7 @@ M 83c9d2701fbf4ed54bd704ca7c4cf67f57e1048d
M 84bc3830fb3d320f843b43d86e90d8a7e7e871d4
M 85225069fe57849cbfac1b039014ce195a1d3bb5
M 8532499404623bd531147ee314ec65544cab34de
+M 8751a7c9e70b23a48e6048de5d75e113218adf94
M 8798b83cef186439b72ff02d9bafa37f9658404e
M 88907f141ee80792627da3cc7846d1562f6c0238
M 8ab434d7b12daa69c68aaad386be939d8ecb6780
@@ -923,6 +925,7 @@ M c0ef051466d775c84ddb20a9a12025d4258fb18b
M c1b52e9ed11541a74d1c7d48e880052c1d38049f
M c1b729ea9f0c43e6560099dbc427751fe33ee088
M c2244fa94cd86e1bd1068f36d9fe2f88269f2a74
+M c2c2a15abff8ad591366280a2fb826afea522157
M c42eec4b0ead390f3e02eb4f1d50cdd4af640fe0
M c5a94eae1cf29b81562cca7baac5c7658201d14d
M c673affb1cc40a38953dd9ce6b567705fa6eef46
[cxf] 02/03: Updating Jetty to 9.4.42.v20210604 in the samples
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 077942941aadecde396b145ddd3e89f45d563d27
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jun 9 10:15:57 2021 +0100
Updating Jetty to 9.4.42.v20210604 in the samples
(cherry picked from commit 941ed53ce451b809809f8270b74aa546be681aa6)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit 8751a7c9e70b23a48e6048de5d75e113218adf94)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index ef0f5fc..533d07a 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.39.v20210325</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.42.v20210604</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.26</cxf.tika.version>