You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/05/02 06:57:45 UTC
[camel] branch master updated: Upgrade Hazelcast to version 3.10
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 9f16d18 Upgrade Hazelcast to version 3.10
9f16d18 is described below
commit 9f16d182c3bab6caa714549bb077da027e502d52
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 2 08:57:28 2018 +0200
Upgrade Hazelcast to version 3.10
---
components/camel-hazelcast/src/test/resources/hazelcast-default.xml | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
index e248a5c..0c41bda 100644
--- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
+++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml
@@ -113,7 +113,7 @@
hz.HIGHER_HITS ; entry with the higher hits wins. hz.LATEST_UPDATE ;
entry with the latest update wins.
-->
- <merge-policy>hz.ADD_NEW_ENTRY</merge-policy>
+ <merge-policy>DiscardMergePolicy</merge-policy>
</map>
</hazelcast>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d6b4d0..7904e16 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -291,7 +291,7 @@
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>3.9.3</hazelcast-version>
+ <hazelcast-version>3.10</hazelcast-version>
<hbase-version>1.2.6</hbase-version>
<hessian-version>4.0.51</hessian-version>
<hibernate-validator-version>6.0.9.Final</hibernate-validator-version>
--
To stop receiving notification emails like this one, please contact
acosentino@apache.org.