Upgraded hazelcast
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/99095714 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99095714 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99095714 Branch: refs/heads/master Commit: 990957145cab4909710ce627045fc7c4243ff2c2 Parents: 36cf2c0 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Nov 7 20:09:43 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Nov 7 20:09:43 2014 +0100 ---------------------------------------------------------------------- .../component/hazelcast/listener/CamelEntryListener.java | 9 +++++++++ .../src/test/resources/hazelcast-default.xml | 2 +- parent/pom.xml | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 3 ++- 4 files changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/99095714/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java ---------------------------------------------------------------------- diff --git a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java index 39385f1..403fa28 100644 --- a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java +++ b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/listener/CamelEntryListener.java @@ -19,6 +19,7 @@ package org.apache.camel.component.hazelcast.listener; import com.hazelcast.core.EntryEvent; import com.hazelcast.core.EntryListener; +import com.hazelcast.core.MapEvent; import org.apache.camel.component.hazelcast.HazelcastConstants; import org.apache.camel.component.hazelcast.HazelcastDefaultConsumer; @@ -39,6 +40,14 @@ public class CamelEntryListener extends CamelListener implements EntryListener<O this.sendExchange(HazelcastConstants.EVICTED, event.getKey(), event.getValue()); } + public void mapEvicted(MapEvent mapEvent) { + // noop + } + + public void mapCleared(MapEvent mapEvent) { + // noop + } + public void entryRemoved(EntryEvent<Object, Object> event) { this.sendExchange(HazelcastConstants.REMOVED, event.getKey(), event.getValue()); } http://git-wip-us.apache.org/repos/asf/camel/blob/99095714/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 6ab15e8..b7bf091 100644 --- a/components/camel-hazelcast/src/test/resources/hazelcast-default.xml +++ b/components/camel-hazelcast/src/test/resources/hazelcast-default.xml @@ -31,7 +31,7 @@ <network> <port auto-increment="true">5701</port> <join> - <multicast enabled="true"> + <multicast enabled="false"> <multicast-group>224.2.2.3</multicast-group> <multicast-port>54327</multicast-port> </multicast> http://git-wip-us.apache.org/repos/asf/camel/blob/99095714/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index bcfda93..40a967d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ <hawtbuf-version>1.11</hawtbuf-version> <hawtdb-version>1.6</hawtdb-version> <hawtdispatch-version>1.21</hawtdispatch-version> - <hazelcast-version>3.2.4</hazelcast-version> + <hazelcast-version>3.3.2</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> @@ -320,6 +320,7 @@ <mina-bundle-version>1.1.7_6</mina-bundle-version> <mina-version>1.1.7</mina-version> <mina2-version>2.0.9</mina2-version> + <minimal-json-version>0.9.1</minimal-json-version> <mock-javamail-version>1.7</mock-javamail-version> <mockito-version>1.9.5</mockito-version> <mongo-java-driver-version>2.12.0</mongo-java-driver-version> http://git-wip-us.apache.org/repos/asf/camel/blob/99095714/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index e3eb555..87fa3d0 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -456,7 +456,8 @@ </feature> <feature name='camel-hazelcast' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <feature>transaction</feature> + <feature>transaction</feature> + <bundle dependency='true'>mvn:com.eclipsesource.minimal-json/minimal-json/${minimal-json-version}</bundle> <bundle dependency='true'>mvn:com.hazelcast/hazelcast/${hazelcast-version}</bundle> <bundle>mvn:org.apache.camel/camel-hazelcast/${project.version}</bundle> </feature>
