diff --git a/src/reference/asciidoc/endpoint-summary.adoc b/src/reference/asciidoc/endpoint-summary.adoc
index 8679839cc35..e7eb365ccdf 100644
--- a/src/reference/asciidoc/endpoint-summary.adoc
+++ b/src/reference/asciidoc/endpoint-summary.adoc
@@ -96,6 +96,12 @@ The following table summarizes the various endpoints with quick links to the app
| N
| <<./graphql.adoc#graphql-outbound-gateway,GraphQL Outbound Gateway>>
+| *Hazelcast*
+| <<./hazelcast.adoc#hazelcast-inbound,Hazelcast Inbound Channel Adapter>>
+| <<./hazelcast.adoc#hazelcast-outbound-channel-adapter,Hazelcast Outbound Channel Adapter>>
+| N
+| N
+
| *HTTP*
| <<./http.adoc#http-namespace,HTTP Namespace Support>>
| <<./http.adoc#http-namespace,HTTP Namespace Support>>
diff --git a/src/reference/asciidoc/endpoint.adoc b/src/reference/asciidoc/endpoint.adoc
index b9e6ed0dcdf..1120cb481b4 100644
--- a/src/reference/asciidoc/endpoint.adoc
+++ b/src/reference/asciidoc/endpoint.adoc
@@ -892,3 +892,4 @@ If the lock registry also provides locks that throw exceptions (ideally, `Interr
By default, the `busyWaitMillis` property adds some additional latency to prevent CPU starvation in the (more usual) case that the locks are imperfect, and you only know they expired when you try to obtain one again.
See <<./zookeeper.adoc#zk-leadership,Zookeeper Leadership Event Handling>> for more information about leadership election and events that use Zookeeper.
+See <<./hazelcast.adoc#hazelcast-leader-election,Hazelcast Leadership Event Handling>> for more information about leadership election and events that use Hazelcast.
diff --git a/src/reference/asciidoc/hazelcast.adoc b/src/reference/asciidoc/hazelcast.adoc
new file mode 100644
index 00000000000..35031c13c33
--- /dev/null
+++ b/src/reference/asciidoc/hazelcast.adoc
@@ -0,0 +1,600 @@
+[[hazelcast]]
+== Hazelcast Support
+
+Spring Integration provides channel adapters and other utility components to interact with an in-memory data grid https://hazelcast.com[Hazelcast].
+
+You need to include this dependency into your project:
+
+====
+[source, xml, subs="normal", role="primary"]
+.Maven
+----
+
+ org.springframework.integration
+ spring-integration-hazelcast
+ {project-version}
+
+----
+[source, groovy, subs="normal", role="secondary"]
+.Gradle
+----
+compile "org.springframework.integration:spring-integration-hazelcast:{project-version}"
+----
+====
+
+The XML namespace and schemaLocation definitions for Hazelcast components are:
+
+====
+[source,xml]
+----
+xmlns:int-hazelcast="http://www.springframework.org/schema/integration/hazelcast"
+xsi:schemaLocation="http://www.springframework.org/schema/integration/hazelcast
+ https://www.springframework.org/schema/integration/hazelcast/spring-integration-hazelcast.xsd"
+----
+====
+
+[[hazelcast-inbound]]
+=== Hazelcast Event-driven Inbound Channel Adapter
+
+Hazelcast provides distributed data structures such as:
+
+* `com.hazelcast.map.IMap`
+* `com.hazelcast.multimap.MultiMap`
+* `com.hazelcast.collection.IList`
+* `com.hazelcast.collection.ISet`
+* `com.hazelcast.collection.IQueue`
+* `com.hazelcast.topic.ITopic`
+* `com.hazelcast.replicatedmap.ReplicatedMap`
+
+It also provides event listeners in order to listen to modifications made to these data structures.
+
+* `com.hazelcast.core.EntryListener`
+* `com.hazelcast.collection.ItemListener`
+* `com.hazelcast.topic.MessageListener`
+
+The Hazelcast Event-Driven Inbound Channel Adapter listens to related cache events and sends event messages to the defined channel.
+It supports both XML and JavaConfig driven configurations.
+
+==== XML Configuration :
+
+====
+[source,xml]
+----
+
+----
+====
+
+The Hazelcast Event-Driven Inbound Channel Adapter requires the following attributes:
+
+* `channel`: Specifies the channel to which messages are sent;
+* `cache`: Specifies the distributed Object reference which is listened to.
+It is a mandatory attribute;
+* `cache-events`: Specifies cache events which are listened for.
+It is an optional attribute and its default value is `ADDED`.
+Its supported values are as follows :
+
+* Supported cache event types for `IMap` and `MultiMap`: `ADDED`, `REMOVED`, `UPDATED`, `EVICTED`, `EVICT_ALL` and `CLEAR_ALL`;
+* Supported cache event types for `ReplicatedMap`: `ADDED`, `REMOVED`, `UPDATED`, `EVICTED`;
+* Supported cache event types for `IList`, `ISet` and `IQueue`: `ADDED`, `REMOVED`.
+There are no cache event types for `ITopic`.
+
+* `cache-listening-policy`: Specifies the cache listening policy as `SINGLE` or `ALL`.
+It is an optional attribute and its default value is `SINGLE`.
+Each Hazelcast inbound channel adapter listening to the same cache object with the same cache-events attribute, can receive a single event message or all event messages.
+If it is `ALL`, all Hazelcast inbound channel adapters listening to the same cache object with the same cache-events attribute, will receive all event messages.
+If it is `SINGLE`, they will receive unique event messages.
+
+Some configuration samples:
+
+====
+[source,xml]
+.Distributed Map
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Distributed MultiMap
+----
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Distributed List
+----
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Distributed Set
+----
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Distributed Queue
+----
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Distributed Topic
+----
+
+
+
+
+
+----
+====
+
+====
+[source,xml]
+.Replicated Map
+----
+
+
+
+
+
+----
+====
+
+==== Java Configuration Sample:
+
+The following sample shows a `DistributedMap` configuration.
+The same configuration can be used for other distributed data structures(`IMap`, `MultiMap`, `ReplicatedMap`, `IList`, `ISet`, `IQueue` and `ITopic`):
+
+====
+[source,java]
+----
+@Bean
+public PollableChannel distributedMapChannel() {
+ return new QueueChannel();
+}
+
+@Bean
+public IMap distributedMap() {
+ return hazelcastInstance().getMap("Distributed_Map");
+}
+
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public HazelcastEventDrivenMessageProducer hazelcastEventDrivenMessageProducer() {
+ final HazelcastEventDrivenMessageProducer producer = new HazelcastEventDrivenMessageProducer(distributedMap());
+ producer.setOutputChannel(distributedMapChannel());
+ producer.setCacheEventTypes("ADDED,REMOVED,UPDATED,CLEAR_ALL");
+ producer.setCacheListeningPolicy(CacheListeningPolicyType.SINGLE);
+
+ return producer;
+}
+----
+====
+
+[[hazelcast-continuous-query]]
+=== Hazelcast Continuous Query Inbound Channel Adapter
+
+Hazelcast Continuous Query enables listening to modifications performed on specific map entries.
+The Hazelcast Continuous Query Inbound Channel Adapter is an event-driven channel adapter which listens to the related distributed map events in the light of the defined predicate.
+
+====
+[source, java, role="primary"]
+.Java
+----
+@Bean
+public PollableChannel cqDistributedMapChannel() {
+ return new QueueChannel();
+}
+
+@Bean
+public IMap cqDistributedMap() {
+ return hazelcastInstance().getMap("CQ_Distributed_Map");
+}
+
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public HazelcastContinuousQueryMessageProducer hazelcastContinuousQueryMessageProducer() {
+ final HazelcastContinuousQueryMessageProducer producer =
+ new HazelcastContinuousQueryMessageProducer(cqDistributedMap(), "surname=TestSurname");
+ producer.setOutputChannel(cqDistributedMapChannel());
+ producer.setCacheEventTypes("UPDATED");
+ producer.setIncludeValue(false);
+
+ return producer;
+}
+----
+[source, xml, role="secondary"]
+.XML
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+----
+====
+
+It supports six attributes as follows:
+
+* `channel`: Specifies the channel to which messages are sent;
+* `cache`: Specifies the distributed Map reference which is listened to.
+Mandatory;
+* `cache-events`: Specifies cache events which are listened for.
+Optional attribute with `ADDED` being its default value.
+Supported values are `ADDED`, `REMOVED`, `UPDATED`, `EVICTED`, `EVICT_ALL` and `CLEAR_ALL`;
+* `predicate`: Specifies a predicate to listen to the modifications performed on specific map entries.
+Mandatory;
+* `include-value`: Specifies including the value and oldValue in a continuous query result.
+Optional with `true` being the default;
+* `cache-listening-policy`: Specifies the cache listening policy as `SINGLE` or `ALL`.
+Optional with the default value being `SINGLE`.
+Each Hazelcast CQ inbound channel adapter listening to the same cache object with the same cache-events attribute, can receive a single event message or all event messages.
+If it is `ALL`, all Hazelcast CQ inbound channel adapters listening to the same cache object with the same cache-events attribute, will receive all event messages.
+If it is `SINGLE`, they will receive unique event messages.
+
+[[hazelcast-cluster-monitor]]
+=== Hazelcast Cluster Monitor Inbound Channel Adapter
+
+A Hazelcast Cluster Monitor supports listening to modifications performed on the cluster.
+The Hazelcast Cluster Monitor Inbound Channel Adapter is an event-driven channel adapter and listens to related Membership, Distributed Object, Migration, Lifecycle and Client events:
+
+====
+[source, java, role="primary"]
+.Java
+----
+@Bean
+public PollableChannel eventChannel() {
+ return new QueueChannel();
+}
+
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public HazelcastClusterMonitorMessageProducer hazelcastClusterMonitorMessageProducer() {
+ HazelcastClusterMonitorMessageProducer producer = new HazelcastClusterMonitorMessageProducer(hazelcastInstance());
+ producer.setOutputChannel(eventChannel());
+ producer.setMonitorEventTypes("DISTRIBUTED_OBJECT");
+
+ return producer;
+}
+----
+[source, xml, role="secondary"]
+.XML
+----
+
+
+
+
+
+
+
+
+
+----
+====
+
+It supports three attributes as follows :
+
+* `channel`: Specifies the channel to which messages are sent;
+* `hazelcast-instance`: Specifies the Hazelcast Instance reference to listen for cluster events.
+It is a mandatory attribute;
+* `monitor-types`: Specifies the monitor types which are listened for.
+It is an optional attribute with `MEMBERSHIP` being the default value.
+Supported values are `MEMBERSHIP`, `DISTRIBUTED_OBJECT`, `MIGRATION`, `LIFECYCLE`, `CLIENT`.
+
+[[hazelcast-distributed-sql]]
+=== Hazelcast Distributed SQL Inbound Channel Adapter
+
+Hazelcast allows running distributed queries on the distributed map.
+The Hazelcast Distributed SQL Inbound Channel Adapter is a polling inbound channel adapter.
+It runs the defined distributed-sql command and returns results depending on the iteration type.
+
+====
+[source, java, role="primary"]
+.Java
+----
+@Bean
+public PollableChannel dsDistributedMapChannel() {
+ return new QueueChannel();
+}
+
+@Bean
+public IMap dsDistributedMap() {
+ return hazelcastInstance().getMap("DS_Distributed_Map");
+}
+
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+@InboundChannelAdapter(value = "dsDistributedMapChannel", poller = @Poller(maxMessagesPerPoll = "1"))
+public HazelcastDistributedSQLMessageSource hazelcastDistributedSQLMessageSource() {
+ final HazelcastDistributedSQLMessageSource messageSource =
+ new HazelcastDistributedSQLMessageSource(dsDistributedMap(),
+ "name='TestName' AND surname='TestSurname'");
+ messageSource.setIterationType(DistributedSQLIterationType.ENTRY);
+
+ return messageSource;
+}
+----
+[source, xml, role="secondary"]
+.XML
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+----
+====
+
+It requires a poller and supports four attributes:
+
+* `channel`: Specifies the channel to which messages are sent.
+It is a mandatory attribute;
+* `cache`: Specifies the distributed `IMap` reference which is queried.
+It is mandatory attribute;
+* `iteration-type`: Specifies result type.
+Distributed SQL can be run on `EntrySet`, `KeySet`, `LocalKeySet` or `Values`.
+It is an optional attribute with `VALUE` being the default.
+Supported values are `ENTRY, `KEY`, `LOCAL_KEY` and `VALUE`;
+* `distributed-sql`: Specifies the where clause of the sql statement.
+It is a mandatory attribute.
+
+[[hazelcast-outbound-channel-adapter]]
+=== Hazelcast Outbound Channel Adapter
+
+The Hazelcast Outbound Channel Adapter listens to its defined channel and writes incoming messages to related distributed cache.
+It expects one of `cache`, `cache-expression` or `HazelcastHeaders.CACHE_NAME` for distributed object definition.
+Supported Distributed Objects are: `IMap`, `MultiMap`, `ReplicatedMap`, `IList`, `ISet`, `IQueue` and `ITopic`.
+
+====
+[source, java, role="primary"]
+.Java
+----
+@Bean
+public MessageChannel distributedMapChannel() {
+ return new DirectChannel();
+}
+
+@Bean
+public IMap distributedMap() {
+ return hzInstance().getMap("Distributed_Map");
+}
+
+@Bean
+public HazelcastInstance hzInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+@ServiceActivator(inputChannel = "distributedMapChannel")
+public HazelcastCacheWritingMessageHandler hazelcastCacheWritingMessageHandler() {
+ HazelcastCacheWritingMessageHandler handler = new HazelcastCacheWritingMessageHandler();
+ handler.setDistributedObject(distributedMap());
+ handler.setKeyExpression(new SpelExpressionParser().parseExpression("payload.id"));
+ handler.setExtractPayload(true);
+ return handler;
+}
+----
+[source, xml, role="secondary"]
+.XML
+----
+
+----
+====
+
+It requires the following attributes :
+
+* `channel`: Specifies the channel to which messages are sent;
+* `cache`: Specifies the distributed object reference.
+Optional;
+* `cache-expression`: Specifies the distributed object via Spring Expression Language (SpEL).
+Optional;
+* `key-expression`: Specifies the key of a key-value pair via Spring Expression Language (SpEL).
+Optional and required for only for `IMap`, `MultiMap` and `ReplicatedMap` distributed data structures.
+* `extract-payload`: Specifies whether to send the whole message or just the payload.
+Optional attribute with `true` being the default.
+If it is true, just the payload will be written to the distributed object.
+Otherwise, the whole message will be written by converting both message headers and payload.
+
+By setting distributed object name in the header, messages can be written to different distributed objects via same channel.
+If `cache` or `cache-expression` attributes are not defined, a `HazelcastHeaders.CACHE_NAME` header has to be set in a request `Message`.
+
+[[hazelcast-leader-election]]
+=== Hazelcast Leader Election
+
+If leader election is needed (e.g. for highly available message consumer where only one node should receive messages) a Hazelcast-based `LeaderInitiator` can be used:
+
+====
+[source,java]
+----
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public LeaderInitiator initiator() {
+ return new LeaderInitiator(hazelcastInstance());
+}
+----
+====
+
+When a node is elected leader it will send an `OnGrantedEvent` to all application listeners.
+
+[[hazelcast-message-store]]
+=== Hazelcast Message Store
+
+For distributed messaging state management, for example for a persistent `QueueChannel` or tracking `Aggregator` message groups, the `HazelcastMessageStore` implementation is provided:
+
+====
+[source,java]
+----
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public MessageGroupStore messageStore() {
+ return new HazelcastMessageStore(hazelcastInstance());
+}
+----
+====
+
+By default, the `SPRING_INTEGRATION_MESSAGE_STORE` `IMap` is used to store messages and groups as a key/value.
+Any custom `IMap` can be provided to the `HazelcastMessageStore`.
+
+[[hazelcast-metadata-store]]
+=== Hazelcast Metadata Store
+
+An implementation of a `ListenableMetadataStore` is available using a backing Hazelcast `IMap`.
+The default map is created with a name `SPRING_INTEGRATION_METADATA_STORE` which can be customized.
+
+====
+[source,java]
+----
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public MetadataStore metadataStore() {
+ return new HazelcastMetadataStore(hazelcastInstance());
+}
+----
+====
+
+The `HazelcastMetadataStore` implements `ListenableMetadataStore` which allows you to register your own listeners of type `MetadataStoreListener` to listen for events via `addListener(MetadataStoreListener callback)`.
+
+
+[[hazelcast-lock-registry]]
+=== Hazelcast Lock Registry
+
+An implementation of a `LockRegistry` is available using a backing Hazelcast distributed `ILock` support:
+
+====
+[source,java]
+----
+@Bean
+public HazelcastInstance hazelcastInstance() {
+ return Hazelcast.newHazelcastInstance();
+}
+
+@Bean
+public LockRegistry lockRegistry() {
+ return new HazelcastLockRegistry(hazelcastInstance());
+}
+----
+====
+
+When used with a shared `MessageGroupStore` (e.g. `Aggregator` store management), the `HazelcastLockRegistry` can be used to provide this functionality across multiple application instances, such that only one instance can manipulate the group at a time.
+
+NOTE: For all the distributed operations the CP Subsystem must be enabled on `HazelcastInstance`.
diff --git a/src/reference/asciidoc/index-single.adoc b/src/reference/asciidoc/index-single.adoc
index 17c95f77514..aae8b157cf3 100644
--- a/src/reference/asciidoc/index-single.adoc
+++ b/src/reference/asciidoc/index-single.adoc
@@ -59,6 +59,8 @@ include::./ftp.adoc[]
include::./graphql.adoc[]
+include::./hazelcast.adoc[]
+
include::./http.adoc[]
include::./jdbc.adoc[]
diff --git a/src/reference/asciidoc/index.adoc b/src/reference/asciidoc/index.adoc
index 4d230c67b7e..af8a0e295dc 100644
--- a/src/reference/asciidoc/index.adoc
+++ b/src/reference/asciidoc/index.adoc
@@ -42,6 +42,7 @@ Welcome to the Spring Integration reference documentation!
<<./file.adoc#files,File Support>> :: Channel adapters and gateways for file system support
<<./ftp.adoc#ftp,FTP/FTPS Adapters>> :: Channel adapters and gateways for FTP protocol
<<./graphql.adoc#graphql,GraphQL Support>> :: Channel adapters for GraphQL
+<<./hazelcast.adoc#hazelcast,Hazelcast Support>> :: Channel adapters, gateways and utilities for Hazelcast
<<./http.adoc#http,HTTP Support>> :: Channel adapters and gateways for HTTP communication
<<./jdbc.adoc#jdbc,JDBC Support>> :: Channel adapters and gateways for JDBC, message and metadata stores
<<./jpa.adoc#jpa,JPA Support>> :: Channel adapters and gateways for JPA API
diff --git a/src/reference/asciidoc/message-store.adoc b/src/reference/asciidoc/message-store.adoc
index e04e78d15d7..0074111860a 100644
--- a/src/reference/asciidoc/message-store.adoc
+++ b/src/reference/asciidoc/message-store.adoc
@@ -40,6 +40,7 @@ However, the typical production application needs a more robust option, not only
Therefore, we also provide `MessageStore` implementations for a variety of data-stores.
The following is a complete list of supported implementations:
+* <<./hazelcast.adoc#hazelcast-message-store,Hazelcast Message Store>>: Uses a Hazelcast distributed cache to store messages
* <<./jdbc.adoc#jdbc-message-store,JDBC Message Store>>: Uses an RDBMS to store messages
* <<./redis.adoc#redis-message-store,Redis Message Store>>: Uses a Redis key/value datastore to store messages
* <<./mongodb.adoc#mongodb-message-store,MongoDB Message Store>>: Uses a MongoDB document store to store messages
diff --git a/src/reference/asciidoc/meta-data-store.adoc b/src/reference/asciidoc/meta-data-store.adoc
index 8ee0a86ac61..5743878ee42 100644
--- a/src/reference/asciidoc/meta-data-store.adoc
+++ b/src/reference/asciidoc/meta-data-store.adoc
@@ -14,6 +14,7 @@ This means that, upon restart, you may end up with duplicate entries.
If you need to persist metadata between application context restarts, the framework provides the following persistent `MetadataStores`:
* `PropertiesPersistingMetadataStore`
+* <<./hazelcast.adoc#hazelcast-metadata-store,Hazelcast Metadata Store>>
* <<./jdbc.adoc#jdbc-metadata-store,JDBC Metadata Store>>
* <<./mongodb.adoc#mongodb-metadata-store,MongoDB Metadata Store>>
* <<./redis.adoc#redis-metadata-store,Redis Metadata Store>>
diff --git a/src/reference/asciidoc/whats-new.adoc b/src/reference/asciidoc/whats-new.adoc
index 618abcac612..ec7befe0729 100644
--- a/src/reference/asciidoc/whats-new.adoc
+++ b/src/reference/asciidoc/whats-new.adoc
@@ -38,6 +38,12 @@ See <<./graphql.adoc#graphql,GraphQL Support>> for more information.
Support for Apache Camel routes has been introduced.
See <<./camel.adoc#camel,Apache Camel Support>> for more information.
+[[x6.0-hazelcast]]
+==== Hazelcast Support
+
+The Hazelcast Spring Integration Extensions project has been migrated as the `spring-integration-hazelcast` module.
+See <<./hazelcast.adoc#hazelcast,Hazelcast Support>> for more information.
+
[[x6.0-smb]]
==== SMB Support