Repository: camel Updated Branches: refs/heads/master 6c29f90cf -> b8d056208
Upgrade Hazelcast to version 3.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b8d05620 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b8d05620 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b8d05620 Branch: refs/heads/master Commit: b8d056208f12f968cc95dbb44df118ca521a2182 Parents: 6c29f90 Author: Andrea Cosentino <anco...@gmail.com> Authored: Fri Jun 19 17:12:04 2015 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Fri Jun 19 17:12:04 2015 +0200 ---------------------------------------------------------------------- .../src/test/resources/hazelcast-default.xml | 27 ++------------------ parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b8d05620/components/camel-hazelcast/src/test/resources/hazelcast-default.xml ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml index b7bf091..12ef6ed 100644 --- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml +++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml @@ -55,26 +55,10 @@ <!-- iteration count to use when generating the secret key --> <iteration-count>19</iteration-count> </symmetric-encryption> - <asymmetric-encryption enabled="false"> - <!-- encryption algorithm --> - <algorithm>RSA/NONE/PKCS1PADDING</algorithm> - <!-- private key password --> - <keyPassword>thekeypass</keyPassword> - <!-- private key alias --> - <keyAlias>local</keyAlias> - <!-- key store type --> - <storeType>JKS</storeType> - <!-- key store password --> - <storePassword>thestorepass</storePassword> - <!-- path to the key store --> - <storePath>keystore</storePath> - </asymmetric-encryption> </network> <executor-service> - <core-pool-size>16</core-pool-size> - <max-pool-size>64</max-pool-size> - <keep-alive-seconds>60</keep-alive-seconds> + <pool-size>64</pool-size> </executor-service> <queue name="default"> @@ -84,14 +68,7 @@ size of the JVM goes down below the maximum. Any integer between 0 and Integer.MAX_VALUE. 0 means Integer.MAX_VALUE. Default is 0. --> - <max-size-per-jvm>0</max-size-per-jvm> - <!-- - Maximum number of seconds for each item to stay in the queue. Items - that are not consumed in <time-to-live-seconds> will automatically - get evicted from the queue. Any integer between 0 and - Integer.MAX_VALUE. 0 means infinite. Default is 0. - --> - <time-to-live-seconds>0</time-to-live-seconds> + <max-size>0</max-size> </queue> <map name="default"> http://git-wip-us.apache.org/repos/asf/camel/blob/b8d05620/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1ccc6ab..909fe52 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -205,7 +205,7 @@ <hawtbuf-version>1.11</hawtbuf-version> <hawtdb-version>1.6</hawtdb-version> <hawtdispatch-version>1.21</hawtdispatch-version> - <hazelcast-version>3.4.2</hazelcast-version> + <hazelcast-version>3.5</hazelcast-version> <hbase-version>0.94.10</hbase-version> <hbase-bundle-version>0.94.6_1</hbase-bundle-version> <hibernate-validator-version>5.0.3.Final</hibernate-validator-version>
