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/01/22 14:43:00 UTC
[cxf] branch 3.2.x-fixes updated (18745d8 -> 9ec58c9)
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 18745d8 Updating Jackson databind
new 8bc3e8f upgrade to jetty 9.4.26.v20200117 (#627)
new 9ec58c9 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: upgrade to jetty 9.4.26.v20200117 (#627)
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 8bc3e8f00ffcde61cc0641ea55fc7d1d11252432
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Jan 22 15:15:06 2020 +0300
upgrade to jetty 9.4.26.v20200117 (#627)
(cherry picked from commit a9eb350f7cc28347ffeb7a8af44ba661531429f1)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/pom.xml
(cherry picked from commit f6bb4090926baa935dba14b655441e79bdabccdd)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
# parent/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 51f15e8..6041994 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.25.v20191220</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.26.v20200117</cxf.jetty9.version>
</properties>
<dependencies>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 1780332..97b0c44 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -126,7 +126,7 @@
<cxf.joda.time.version>2.9.4</cxf.joda.time.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
<cxf.jettison.version>1.4.0</cxf.jettison.version>
- <cxf.jetty9.version>9.4.25.v20191220</cxf.jetty9.version>
+ <cxf.jetty9.version>9.4.26.v20200117</cxf.jetty9.version>
<cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
<cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
<cxf.undertow.version>1.4.27.Final</cxf.undertow.version>
[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 9ec58c91b148d51e4ecf9ee47cde6c6a9fc72375
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Jan 22 13:50:36 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 67571ee..3262aee 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -215,6 +215,7 @@ B 4104641a4b731c72d66b1dace3d9ed4290226694
B 416c74f964580edad80936bb9c31ec7b6f03d4a0
B 41c834aea9bc6a537f7b336e626d07036e40b5c6
B 4206b97eed0cf8e2593336053d9f2d08d8a04367
+B 42074b8d90d6fa315571abd616851aaf481670cb
B 42338421b7495b9497caee8322f98f6c523b59a5
B 424591420b052a2b557d3f1dd48609c9858d9809
B 4324a1ff40f23ff602be25229fe13292b942124e
@@ -922,6 +923,7 @@ M eda37b0df9af9df3df8378c744900b75cbbac6e5
M ee94d2d2d5a39836ef94f74892ccec2212411e6a
M efb2c3082fe8799a9d90a696e31239551b4f1823
M f09ae1ed3bbc88a6d7860697dd65821fd9958d99
+M f6bb4090926baa935dba14b655441e79bdabccdd
M f7ae16dff9561db9bc16e1ad82ae75e93fdb735d
M fc4f94f663db6a27d2352a9b6424e42c89f7a522
M fd2c5e310aab1e241e868600be9a7748279f0987