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/03/26 11:51:34 UTC
[cxf] branch 3.2.x-fixes updated (7822f27 -> c4449f9)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 7822f27 Recording .gitmergeinfo Changes
new 7de9c22 Updating Jetty version in samples to 9.4.27.v20200227
new c4449f9 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 | 5 +++++
distribution/src/main/release/samples/pom.xml | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
[cxf] 01/02: Updating Jetty version in samples to 9.4.27.v20200227
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7de9c226ac4d8b436200ca307ee6ea0eb70b0a4e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Mar 25 14:06:23 2020 +0000
Updating Jetty version in samples to 9.4.27.v20200227
(cherry picked from commit ccb743e48e9ed99e240ae05f373b6ff799085049)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit 4793d9a1aa336843e106e7e9ce20cdae502d31cd)
# 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 367b48d..544fe07 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>1.5.17.RELEASE</spring.boot.version>
<spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
- <cxf.jetty9.version>9.4.26.v20200117</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.27.v20200227</cxf.jetty9.version>
<cxf.tika.version>1.24</cxf.tika.version>
</properties>
<dependencies>
[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.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c4449f91d1a233bb6b2400db7244015ca3ebd919
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Mar 26 11:33:45 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 918d00b..c78b1bc 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -157,6 +157,7 @@ B 2d96d6979b3ead31f7111410e7916e39a0f3205d
B 2db1206ab6ae5db6fefe9adf0f6df837b0dd8e65
B 2dc596017e24b79bc66bff7a91453908ccf2e7a2
B 2dd40f3371e8c8ad1058be0f8f261af10f4eaff3
+B 2de1581c42267dd5d54f8bdfed5784151d7ac26e
B 2e44ce12233c213b5fef8bbc28d71554554a8fbb
B 2e6a14e5ea087eb599415980d21861313f333583
B 2f193c43cfded7020733cd874c6428fe7a35ab02
@@ -164,6 +165,7 @@ B 2fad69a02a19773bdb6ca1261bc7bc3f1864e685
B 2fb9f9835cbd678f5c9028ea33b131b6b6a90aa0
B 2feebc95ad5bb522864aa2b06b5e2a0e0526e550
B 310aa9a2c0589c12ba3baa1556da193054e505c6
+B 310d46814593cbb16ca2531417142530c63fbca9
B 3117e62c01ca9fa10fec395304bde3723c67e16b
B 319093538ca614e51da87ca52df85d83093b962b
B 320a7f161a4c4eb7c6f2379a9a4238dbb7e2e66f
@@ -498,6 +500,7 @@ B 9185a35ad95d74be43b23905e3ed45f0444eba94
B 91a3122620ecf8ff767f2d769726b6039dbda6d4
B 91ec685734fd2462af9673eb6f553246dae8fcc4
B 92c5a87077464d56dfa4090a9824e81e53634454
+B 92d34cab5f11a74908294c2953fc4f42c8366a90
B 92ec9eecc3f97758b5419f750aa688005b284751
B 93a6a50f59f7d2e858174efd26fa5b5ac1334cc5
B 93bc0ddb7f662cb0587210f861f672e7a62f7ff4
@@ -727,6 +730,7 @@ B d873c8b623ed10464c1f1bae44a31fc725307676
B d89aa0baafba3d0433be054d45606e223479b620
B da0e646ea6184565fc811244c6830f411ade07db
B da5b01b32a59867b48e2b35a9281b3625f58d514
+B daec9aa6d7b995c132305baeb0c81323f75c3565
B db0c8377d5783aa5175ed091d9ed26a0df42fe21
B db7ce85f644a6a693b8ee581ad60cd348a598a7c
B dbadb55bdb8270e39202fa75f5aa9ba417d93805
@@ -903,6 +907,7 @@ M 4233f9138de22fe5de555d2f176e494e62905de5
M 427c7d40f35427a0866b6b9989d50a34fd10482b
M 431bf666e8810c87ab5f47b0c137d329d381b1c6
M 46259489c1abd3f374203cd48f50a67640ba81a6
+M 4793d9a1aa336843e106e7e9ce20cdae502d31cd
M 48869dd57d54650615ed1347d9aa44ae76e88265
M 48c48f1c3edcca07365145df38a71ee6586070b8
M 4a07401299848a1d9b54346b6827132cdf5ec80b