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 2019/08/08 10:19:59 UTC
[cxf] branch 3.2.x-fixes updated (00d9eb9 -> 066c264)
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 00d9eb9 fix compilation failure
new 60327a4 Updating Hazelcast
new 066c264 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 | 1 +
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
[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 066c264fd28a16c43fc886218076cff12d1807a8
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Aug 8 11:19:43 2019 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 25a5775..5e1d6ac 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -653,6 +653,7 @@ M 48869dd57d54650615ed1347d9aa44ae76e88265
M 48c48f1c3edcca07365145df38a71ee6586070b8
M 4a07401299848a1d9b54346b6827132cdf5ec80b
M 4a9d4a1b6e9ce5423c3d84d46978287213e6495f
+M 4c4bbee3d6731044256c889fc6b8284e1e120ebf
M 4f8ae843f56e3ef84af43ae90f507e196726f0bf
M 4f9923c32688c57e31f933c69d9c2a667f20d63d
M 4fea734b1349ba023c2e560deda4aa0eaede7f3b
[cxf] 01/02: Updating Hazelcast
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 60327a4d2fe1097538df3d6ab13db3c3102bae2a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Aug 8 11:18:50 2019 +0100
Updating Hazelcast
(cherry picked from commit 4c4bbee3d6731044256c889fc6b8284e1e120ebf)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 2919d4f..db5d21e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
<cxf.ehcache3.version>3.0.3</cxf.ehcache3.version>
<cxf.fastinfoset.bundle.version>1.2.13_1</cxf.fastinfoset.bundle.version>
<cxf.guava.version>20.0</cxf.guava.version>
- <cxf.hazelcast.version>3.12</cxf.hazelcast.version>
+ <cxf.hazelcast.version>3.12.2</cxf.hazelcast.version>
<cxf.hibernate.em.version>5.3.7.Final</cxf.hibernate.em.version>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>