From f0b11ef36eb4603c3f356ba3ab06390e1800c49c Mon Sep 17 00:00:00 2001
From: donnerbart <github@thunderphreak.de>
Date: Mon, 25 Jun 2018 15:23:15 +0200
Subject: [PATCH] Updated Hazelcast version to 3.11

---
 .../src/main/resources/hazelcast-client.xml   |  3 +-
 .../src/main/resources/hazelcast-client.xml   |  3 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../scale-up/src/main/resources/hazelcast.xml |  2 +-
 .../backup/src/main/resources/hazelcast.xml   |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../eviction/src/main/resources/hazelcast.xml |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../index/src/main/resources/hazelcast.xml    |  2 +-
 .../mapstore/src/main/resources/hazelcast.xml |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../resources/hazelcast-client-hd-memory.xml  |  3 +-
 .../main/resources/hazelcast-hd-memory.xml    |  2 +-
 .../resources/hazelcast-solace-clusterA.xml   |  2 +-
 .../resources/hazelcast-solace-clusterB.xml   |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../templates/default/hazelcast.xml.erb       |  2 +-
 .../src/main/resources/hazelcast-aws.xml      |  3 +-
 .../src/main/resources/hazelcast-local.xml    |  3 +-
 .../src/main/webapp/WEB-INF/hazelcast.xml     |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../mongodb/src/main/resources/hazelcast.xml  |  3 +-
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 hazelcast-integration/pom.xml                 |  1 -
 .../src/main/resources/applicationContext.xml |  2 +-
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 .../server/src/main/resources/hazelcast.xml   |  3 +-
 .../src/main/resources/hazelcast.xml          |  3 +-
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 .../applicationContext-hazelcast.xml          |  2 +-
 .../src/main/resources/applicationContext.xml |  2 +-
 .../src/main/webapp/WEB-INF/hazelcast.xml     |  3 +-
 .../src/main/resources/applicationContext.xml | 11 +++---
 .../src/main/resources/applicationContext.xml |  2 +-
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 .../src/main/resources/hazelcast.xml          |  5 +--
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 .../src/main/resources/hazelcast.xml          |  4 +-
 helper/pom.xml                                |  1 +
 .../src/main/resources/hazelcast.xml          |  7 ++--
 .../src/main/resources/hazelcast-client.xml   |  7 ++--
 .../src/main/resources/hazelcast-client.xml   |  7 ++--
 .../main/resources/hazelcast-client-c1.xml    |  3 +-
 .../main/resources/hazelcast-client-c2.xml    |  3 +-
 .../src/main/resources/hazelcast-client.xml   |  3 +-
 .../hazelcast-declarative-eviction-test.xml   |  2 +-
 .../resources/hazelcast-declarative-full.xml  |  2 +-
 .../hazelcast-declarative-listener-test.xml   |  2 +-
 .../src/main/resources/hazelcast-quorum.xml   |  2 +-
 .../main/resources/hazelcast-splitbrain.xml   |  2 +-
 jcache/src/main/resources/hazelcast.xml       |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../hazelcast-client-network-config.xml       |  2 +-
 .../src/main/resources/hazelcast-client.xml   |  2 +-
 .../resources/hazelcast-network-config.xml    |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast-client.xml   |  7 ++--
 .../src/main/resources/hazelcast-client.xml   |  7 ++--
 .../src/main/resources/hazelcast.xml          |  9 +++--
 .../aws/src/main/resources/hazelcast.xml      |  2 +-
 .../firewall/src/main/resources/hazelcast.xml |  2 +-
 .../group1/src/main/resources/hazelcast.xml   |  2 +-
 .../group2/src/main/resources/hazelcast.xml   |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../jclouds/src/main/resources/hazelcast.xml  |  2 +-
 .../src/main/resources/hazelcast.xml          |  3 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../port/src/main/resources/hazelcast.xml     |  2 +-
 .../ssl/src/main/resources/hazelcast.xml      |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../tcpip/src/main/resources/hazelcast.xml    |  2 +-
 .../src/main/resources/hazelcast.xml          | 23 ++++++------
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          | 37 ++++++++++---------
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  4 +-
 .../portable/src/main/resources/hazelcast.xml |  2 +-
 .../src/main/resources/hazelcast.xml          |  3 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 spi/backups/src/main/resources/hazelcast.xml  |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  3 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  2 +-
 .../src/main/resources/hazelcast.xml          |  7 ++--
 spi/proxy/src/main/resources/hazelcast.xml    |  2 +-
 variable-replacers/hazelcast-exec-linux.xml   | 11 +++---
 variable-replacers/hazelcast-exec-windows.xml | 11 +++---
 variable-replacers/hazelcast-plain.xml        |  7 ++--
 .../hazelcast-with-replacers.xml              | 11 +++---
 109 files changed, 192 insertions(+), 180 deletions(-)

diff --git a/clients/client-near-cache/src/main/resources/hazelcast-client.xml b/clients/client-near-cache/src/main/resources/hazelcast-client.xml
index 920a2f0d7..cc3c4616d 100644
--- a/clients/client-near-cache/src/main/resources/hazelcast-client.xml
+++ b/clients/client-near-cache/src/main/resources/hazelcast-client.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <near-cache name="articlesSerializedKeys">
diff --git a/clients/client-statistics/src/main/resources/hazelcast-client.xml b/clients/client-statistics/src/main/resources/hazelcast-client.xml
index bb9208da2..8649cbff1 100644
--- a/clients/client-statistics/src/main/resources/hazelcast-client.xml
+++ b/clients/client-statistics/src/main/resources/hazelcast-client.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
     <properties>
         <property name="hazelcast.client.statistics.enabled">true</property>
diff --git a/cluster-quorum-xml/src/main/resources/hazelcast.xml b/cluster-quorum-xml/src/main/resources/hazelcast.xml
index e1082044d..ea4349251 100644
--- a/cluster-quorum-xml/src/main/resources/hazelcast.xml
+++ b/cluster-quorum-xml/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <!--
diff --git a/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml b/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml
index 63100d2fe..9a57d16b9 100644
--- a/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml
+++ b/distributed-collections/boundedblockingqueue/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.1.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-collections/queuestore/src/main/resources/hazelcast.xml b/distributed-collections/queuestore/src/main/resources/hazelcast.xml
index 2a8811db9..494534b12 100644
--- a/distributed-collections/queuestore/src/main/resources/hazelcast.xml
+++ b/distributed-collections/queuestore/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <!-- we need to configure the queue store here -->
diff --git a/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml b/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml
index 626359312..717977ebc 100644
--- a/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml
+++ b/distributed-collections/ringbuffer/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-collections/ringbufferstore/src/main/resources/hazelcast.xml b/distributed-collections/ringbufferstore/src/main/resources/hazelcast.xml
index b51e759b1..7b297ba80 100644
--- a/distributed-collections/ringbufferstore/src/main/resources/hazelcast.xml
+++ b/distributed-collections/ringbufferstore/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <ringbuffer name="object-ringbuffer-xml">
diff --git a/distributed-executor/scale-out/src/main/resources/hazelcast.xml b/distributed-executor/scale-out/src/main/resources/hazelcast.xml
index 54f473de5..3942b2677 100644
--- a/distributed-executor/scale-out/src/main/resources/hazelcast.xml
+++ b/distributed-executor/scale-out/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-executor/scale-up/src/main/resources/hazelcast.xml b/distributed-executor/scale-up/src/main/resources/hazelcast.xml
index 3b58038ca..fe15a563e 100644
--- a/distributed-executor/scale-up/src/main/resources/hazelcast.xml
+++ b/distributed-executor/scale-up/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <executor-service name="executor">
diff --git a/distributed-map/backup/src/main/resources/hazelcast.xml b/distributed-map/backup/src/main/resources/hazelcast.xml
index 66d88a31a..feedf4db3 100644
--- a/distributed-map/backup/src/main/resources/hazelcast.xml
+++ b/distributed-map/backup/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/distributed-map/custom-attributes/src/main/resources/hazelcast.xml b/distributed-map/custom-attributes/src/main/resources/hazelcast.xml
index 9c990d4c2..5459a6609 100644
--- a/distributed-map/custom-attributes/src/main/resources/hazelcast.xml
+++ b/distributed-map/custom-attributes/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/distributed-map/entry-processor/src/main/resources/hazelcast.xml b/distributed-map/entry-processor/src/main/resources/hazelcast.xml
index a41733014..a867901ec 100644
--- a/distributed-map/entry-processor/src/main/resources/hazelcast.xml
+++ b/distributed-map/entry-processor/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/distributed-map/eviction/src/main/resources/hazelcast.xml b/distributed-map/eviction/src/main/resources/hazelcast.xml
index 6ae1b2d33..d45c8d129 100644
--- a/distributed-map/eviction/src/main/resources/hazelcast.xml
+++ b/distributed-map/eviction/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/distributed-map/fast-aggregations/src/main/resources/hazelcast.xml b/distributed-map/fast-aggregations/src/main/resources/hazelcast.xml
index 15a52e74e..e8c3e12f8 100644
--- a/distributed-map/fast-aggregations/src/main/resources/hazelcast.xml
+++ b/distributed-map/fast-aggregations/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-map/hashcode-and-equals/src/main/resources/hazelcast.xml b/distributed-map/hashcode-and-equals/src/main/resources/hazelcast.xml
index 3451f87bd..3f5d8509a 100644
--- a/distributed-map/hashcode-and-equals/src/main/resources/hazelcast.xml
+++ b/distributed-map/hashcode-and-equals/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <map name="objectMap">
diff --git a/distributed-map/in-memory-format/src/main/resources/hazelcast.xml b/distributed-map/in-memory-format/src/main/resources/hazelcast.xml
index 7a8f38faf..a376b4a3b 100644
--- a/distributed-map/in-memory-format/src/main/resources/hazelcast.xml
+++ b/distributed-map/in-memory-format/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-map/index/src/main/resources/hazelcast.xml b/distributed-map/index/src/main/resources/hazelcast.xml
index c6723e7d7..e6001881a 100644
--- a/distributed-map/index/src/main/resources/hazelcast.xml
+++ b/distributed-map/index/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/distributed-map/mapstore/src/main/resources/hazelcast.xml b/distributed-map/mapstore/src/main/resources/hazelcast.xml
index 4a2de40af..a00a5aacd 100644
--- a/distributed-map/mapstore/src/main/resources/hazelcast.xml
+++ b/distributed-map/mapstore/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <map name="personMap">
diff --git a/distributed-map/nearcache/src/main/resources/hazelcast.xml b/distributed-map/nearcache/src/main/resources/hazelcast.xml
index dbac01ab9..748037a73 100644
--- a/distributed-map/nearcache/src/main/resources/hazelcast.xml
+++ b/distributed-map/nearcache/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <map name="articlesSerializedKeys">
diff --git a/distributed-map/projections/src/main/resources/hazelcast.xml b/distributed-map/projections/src/main/resources/hazelcast.xml
index 15a52e74e..e8c3e12f8 100644
--- a/distributed-map/projections/src/main/resources/hazelcast.xml
+++ b/distributed-map/projections/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-primitives/semaphore/src/main/resources/hazelcast.xml b/distributed-primitives/semaphore/src/main/resources/hazelcast.xml
index f8623aa9e..86313f790 100644
--- a/distributed-primitives/semaphore/src/main/resources/hazelcast.xml
+++ b/distributed-primitives/semaphore/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/distributed-topic/reliable-topic/src/main/resources/hazelcast.xml b/distributed-topic/reliable-topic/src/main/resources/hazelcast.xml
index ee083606b..7f98a10ca 100644
--- a/distributed-topic/reliable-topic/src/main/resources/hazelcast.xml
+++ b/distributed-topic/reliable-topic/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/enterprise/hd-memory-client-server/hd-memory-examples-client/src/main/resources/hazelcast-client-hd-memory.xml b/enterprise/hd-memory-client-server/hd-memory-examples-client/src/main/resources/hazelcast-client-hd-memory.xml
index 5c9808340..a83927950 100644
--- a/enterprise/hd-memory-client-server/hd-memory-examples-client/src/main/resources/hazelcast-client-hd-memory.xml
+++ b/enterprise/hd-memory-client-server/hd-memory-examples-client/src/main/resources/hazelcast-client-hd-memory.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <group>
diff --git a/enterprise/hd-memory-client-server/hd-memory-examples-server/src/main/resources/hazelcast-hd-memory.xml b/enterprise/hd-memory-client-server/hd-memory-examples-server/src/main/resources/hazelcast-hd-memory.xml
index 547de6d3c..92bb6ab53 100644
--- a/enterprise/hd-memory-client-server/hd-memory-examples-server/src/main/resources/hazelcast-hd-memory.xml
+++ b/enterprise/hd-memory-client-server/hd-memory-examples-server/src/main/resources/hazelcast-hd-memory.xml
@@ -16,7 +16,7 @@
   -->
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterA.xml b/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterA.xml
index a469efca8..255017d04 100644
--- a/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterA.xml
+++ b/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterA.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterB.xml b/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterB.xml
index 175086b77..4a2e2cc25 100644
--- a/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterB.xml
+++ b/enterprise/wan-replication/src/main/resources/hazelcast-solace-clusterB.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/enterprise/wan-replication/src/main/resources/hazelcast.xml b/enterprise/wan-replication/src/main/resources/hazelcast.xml
index cc6ea0207..d18935cf9 100644
--- a/enterprise/wan-replication/src/main/resources/hazelcast.xml
+++ b/enterprise/wan-replication/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/hazelcast-integration/amazon-ec2-vagrant-chef/src/main/chef/cookbooks/hazelcast-integration-amazon-ec2/templates/default/hazelcast.xml.erb b/hazelcast-integration/amazon-ec2-vagrant-chef/src/main/chef/cookbooks/hazelcast-integration-amazon-ec2/templates/default/hazelcast.xml.erb
index c31650e56..363d84f49 100644
--- a/hazelcast-integration/amazon-ec2-vagrant-chef/src/main/chef/cookbooks/hazelcast-integration-amazon-ec2/templates/default/hazelcast.xml.erb
+++ b/hazelcast-integration/amazon-ec2-vagrant-chef/src/main/chef/cookbooks/hazelcast-integration-amazon-ec2/templates/default/hazelcast.xml.erb
@@ -21,7 +21,7 @@
     - no hazelcast.xml if present
 
 -->
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
+<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <group>
diff --git a/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-aws.xml b/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-aws.xml
index 51746900c..f0d7c7094 100644
--- a/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-aws.xml
+++ b/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-aws.xml
@@ -16,10 +16,9 @@
   ~  limitations under the License.
   ~
   -->
-
 <hazelcast
         xsi:schemaLocation="http://www.hazelcast.com/schema/config
-        http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <group>
diff --git a/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-local.xml b/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-local.xml
index 626080afd..400464541 100644
--- a/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-local.xml
+++ b/hazelcast-integration/amazon-elasticbeanstalk/src/main/resources/hazelcast-local.xml
@@ -16,10 +16,9 @@
   ~  limitations under the License.
   ~
   -->
-
 <hazelcast
         xsi:schemaLocation="http://www.hazelcast.com/schema/config
-        http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <group>
diff --git a/hazelcast-integration/filter-based-session-replication/src/main/webapp/WEB-INF/hazelcast.xml b/hazelcast-integration/filter-based-session-replication/src/main/webapp/WEB-INF/hazelcast.xml
index 4c28d0466..a9c497f95 100644
--- a/hazelcast-integration/filter-based-session-replication/src/main/webapp/WEB-INF/hazelcast.xml
+++ b/hazelcast-integration/filter-based-session-replication/src/main/webapp/WEB-INF/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <management-center enabled="true">http://localhost:8090/mancenter</management-center>
diff --git a/hazelcast-integration/hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml b/hazelcast-integration/hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
index 5f46be7a5..5813a1fcf 100644
--- a/hazelcast-integration/hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/hibernate-2ndlevel-cache/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/hazelcast-integration/hibernate-jpa-2ndlevel-cache/src/main/resources/hazelcast.xml b/hazelcast-integration/hibernate-jpa-2ndlevel-cache/src/main/resources/hazelcast.xml
index 5f46be7a5..5813a1fcf 100644
--- a/hazelcast-integration/hibernate-jpa-2ndlevel-cache/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/hibernate-jpa-2ndlevel-cache/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/hazelcast-integration/mongodb/src/main/resources/hazelcast.xml b/hazelcast-integration/mongodb/src/main/resources/hazelcast.xml
index a5c897613..31e096bf2 100644
--- a/hazelcast-integration/mongodb/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/mongodb/src/main/resources/hazelcast.xml
@@ -17,7 +17,8 @@
   ~
   -->
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml
index fe814fa8c..6ba730418 100644
--- a/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml
+++ b/hazelcast-integration/openshift/client-apps/ocp-demo-frontend/src/main/resources/hazelcast-client.xml
@@ -1,6 +1,6 @@
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <properties>
diff --git a/hazelcast-integration/pom.xml b/hazelcast-integration/pom.xml
index 048fe2a0f..12bbfe038 100644
--- a/hazelcast-integration/pom.xml
+++ b/hazelcast-integration/pom.xml
@@ -16,7 +16,6 @@
   ~  limitations under the License.
   ~
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/hazelcast-integration/spring-cache-manager/src/main/resources/applicationContext.xml b/hazelcast-integration/spring-cache-manager/src/main/resources/applicationContext.xml
index bb99ed09c..f5aaa2ec4 100644
--- a/hazelcast-integration/spring-cache-manager/src/main/resources/applicationContext.xml
+++ b/hazelcast-integration/spring-cache-manager/src/main/resources/applicationContext.xml
@@ -6,7 +6,7 @@
                "http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
               http://www.hazelcast.com/schema/spring
-              http://www.hazelcast.com/schema/spring/hazelcast-spring-3.10.xsd
+              http://www.hazelcast.com/schema/spring/hazelcast-spring-3.11.xsd
               http://www.springframework.org/schema/cache
               http://www.springframework.org/schema/cache/spring-cache.xsd
        ">
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml b/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
index 849e261c2..2ae3a2341 100644
--- a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
+++ b/hazelcast-integration/spring-data-hazelcast-chemistry-sample/client/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast-client
         xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-        http://www.hazelcast.com/schema/config/hazelcast-client-config-3.10.xsd"
+        http://www.hazelcast.com/schema/config/hazelcast-client-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/client-config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml b/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
index 8de2408fa..534ae7cc0 100644
--- a/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/spring-data-hazelcast-chemistry-sample/server/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml b/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
index 1e6a6ecb4..1ff87356a 100644
--- a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-hz-main/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml b/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
index 47997c8c1..db24c25b1 100644
--- a/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
+++ b/hazelcast-integration/spring-data-jpa-hazelcast-migration/after/after-main/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast-client
         xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/client-config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/applicationContext-hazelcast.xml b/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/applicationContext-hazelcast.xml
index 1e7e35529..4cf8046f1 100644
--- a/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/applicationContext-hazelcast.xml
+++ b/hazelcast-integration/spring-hibernate-2ndlevel-cache/src/main/resources/applicationContext-hazelcast.xml
@@ -4,7 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 	    http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.hazelcast.com/schema/spring
-        http://www.hazelcast.com/schema/spring/hazelcast-spring-3.10.xsd">
+        http://www.hazelcast.com/schema/spring/hazelcast-spring-3.11.xsd">
 
     <hz:map id="customerMap" name="customerMap" instance-ref="instance"/>
 
diff --git a/hazelcast-integration/spring-jcache/src/main/resources/applicationContext.xml b/hazelcast-integration/spring-jcache/src/main/resources/applicationContext.xml
index 399150138..c9d2f9e06 100644
--- a/hazelcast-integration/spring-jcache/src/main/resources/applicationContext.xml
+++ b/hazelcast-integration/spring-jcache/src/main/resources/applicationContext.xml
@@ -24,7 +24,7 @@
 		http://www.springframework.org/schema/cache
 		http://www.springframework.org/schema/cache/spring-cache.xsd
 		http://www.hazelcast.com/schema/spring
-		http://www.hazelcast.com/schema/spring/hazelcast-spring-3.10.xsd">
+		http://www.hazelcast.com/schema/spring/hazelcast-spring-3.11.xsd">
 
     <cache:annotation-driven/>
 
diff --git a/hazelcast-integration/spring-security/src/main/webapp/WEB-INF/hazelcast.xml b/hazelcast-integration/spring-security/src/main/webapp/WEB-INF/hazelcast.xml
index 1ffb6c762..aaa71514e 100755
--- a/hazelcast-integration/spring-security/src/main/webapp/WEB-INF/hazelcast.xml
+++ b/hazelcast-integration/spring-security/src/main/webapp/WEB-INF/hazelcast.xml
@@ -1,5 +1,6 @@
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 </hazelcast>
diff --git a/hazelcast-integration/spring-transaction-manager/src/main/resources/applicationContext.xml b/hazelcast-integration/spring-transaction-manager/src/main/resources/applicationContext.xml
index f65c425d1..6a4af507d 100644
--- a/hazelcast-integration/spring-transaction-manager/src/main/resources/applicationContext.xml
+++ b/hazelcast-integration/spring-transaction-manager/src/main/resources/applicationContext.xml
@@ -2,11 +2,12 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:hz="http://www.hazelcast.com/schema/spring"
        xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation=
-               "http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-              http://www.hazelcast.com/schema/spring http://www.hazelcast.com/schema/spring/hazelcast-spring-3.10.xsd
-              http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
-       ">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+               http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+              http://www.hazelcast.com/schema/spring
+              http://www.hazelcast.com/schema/spring/hazelcast-spring-3.11.xsd
+              http://www.springframework.org/schema/tx
+              http://www.springframework.org/schema/tx/spring-tx.xsd">
 
     <hz:hazelcast id="instance">
         <hz:config>
diff --git a/hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml b/hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml
index 5e7ae1674..e839e90f0 100644
--- a/hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml
+++ b/hazelcast-integration/springaware-annotation/src/main/resources/applicationContext.xml
@@ -7,7 +7,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 		http://www.hazelcast.com/schema/spring
-		http://www.hazelcast.com/schema/spring/hazelcast-spring-3.10.xsd
+		http://www.hazelcast.com/schema/spring/hazelcast-spring-3.11.xsd
 		http://www.springframework.org/schema/context
         http://www.springframework.org/schema/context/spring-context.xsd">
 
diff --git a/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast-client.xml b/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast-client.xml
index 277d563b8..3af8edc1a 100644
--- a/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast-client.xml
+++ b/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast-client.xml
@@ -18,7 +18,7 @@
   -->
 <hazelcast-client
         xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/client-config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast.xml b/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast.xml
index 17d172231..76ce35aec 100644
--- a/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/springboot-caching-jcache/src/main/resources/hazelcast.xml
@@ -16,9 +16,9 @@
   ~  limitations under the License.
   ~
   -->
-
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
@@ -35,5 +35,4 @@
         <management-enabled>true</management-enabled>
         <statistics-enabled>true</statistics-enabled>
     </cache>
-
 </hazelcast>
diff --git a/hazelcast-integration/springboot-caching/src/main/resources/hazelcast-client.xml b/hazelcast-integration/springboot-caching/src/main/resources/hazelcast-client.xml
index 277d563b8..3af8edc1a 100644
--- a/hazelcast-integration/springboot-caching/src/main/resources/hazelcast-client.xml
+++ b/hazelcast-integration/springboot-caching/src/main/resources/hazelcast-client.xml
@@ -18,7 +18,7 @@
   -->
 <hazelcast-client
         xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+        http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/client-config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/hazelcast-integration/springboot-caching/src/main/resources/hazelcast.xml b/hazelcast-integration/springboot-caching/src/main/resources/hazelcast.xml
index 1b88673cf..d54415855 100644
--- a/hazelcast-integration/springboot-caching/src/main/resources/hazelcast.xml
+++ b/hazelcast-integration/springboot-caching/src/main/resources/hazelcast.xml
@@ -16,9 +16,9 @@
   ~  limitations under the License.
   ~
   -->
-
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/helper/pom.xml b/helper/pom.xml
index b123a60ed..bdb3cb727 100644
--- a/helper/pom.xml
+++ b/helper/pom.xml
@@ -10,6 +10,7 @@
         <artifactId>code-samples</artifactId>
         <groupId>com.hazelcast.samples</groupId>
         <version>0.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <properties>
diff --git a/jcache-1.1/times-table/jcache-server/src/main/resources/hazelcast.xml b/jcache-1.1/times-table/jcache-server/src/main/resources/hazelcast.xml
index 8b8f4d657..f76ac45aa 100644
--- a/jcache-1.1/times-table/jcache-server/src/main/resources/hazelcast.xml
+++ b/jcache-1.1/times-table/jcache-server/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
         <join>
diff --git a/jcache-1.1/times-table/jcache-spring/src/main/resources/hazelcast-client.xml b/jcache-1.1/times-table/jcache-spring/src/main/resources/hazelcast-client.xml
index 7c345a524..549265587 100644
--- a/jcache-1.1/times-table/jcache-spring/src/main/resources/hazelcast-client.xml
+++ b/jcache-1.1/times-table/jcache-spring/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.10.xsd"
-                  xmlns="http://www.hazelcast.com/schema/client-config"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
+                  xmlns="http://www.hazelcast.com/schema/client-config">
 
     <network>
         <cluster-members>
diff --git a/jcache-1.1/times-table/jcache-standard/src/main/resources/hazelcast-client.xml b/jcache-1.1/times-table/jcache-standard/src/main/resources/hazelcast-client.xml
index 7c345a524..549265587 100644
--- a/jcache-1.1/times-table/jcache-standard/src/main/resources/hazelcast-client.xml
+++ b/jcache-1.1/times-table/jcache-standard/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.10.xsd"
-                  xmlns="http://www.hazelcast.com/schema/client-config"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
+                  xmlns="http://www.hazelcast.com/schema/client-config">
 
     <network>
         <cluster-members>
diff --git a/jcache/src/main/resources/hazelcast-client-c1.xml b/jcache/src/main/resources/hazelcast-client-c1.xml
index c2131a993..fa6a4d925 100644
--- a/jcache/src/main/resources/hazelcast-client-c1.xml
+++ b/jcache/src/main/resources/hazelcast-client-c1.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <group>
diff --git a/jcache/src/main/resources/hazelcast-client-c2.xml b/jcache/src/main/resources/hazelcast-client-c2.xml
index 9b04e5b0c..cac1ef90e 100644
--- a/jcache/src/main/resources/hazelcast-client-c2.xml
+++ b/jcache/src/main/resources/hazelcast-client-c2.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <group>
diff --git a/jcache/src/main/resources/hazelcast-client.xml b/jcache/src/main/resources/hazelcast-client.xml
index 02d6837af..9f243a0b6 100644
--- a/jcache/src/main/resources/hazelcast-client.xml
+++ b/jcache/src/main/resources/hazelcast-client.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <group>
diff --git a/jcache/src/main/resources/hazelcast-declarative-eviction-test.xml b/jcache/src/main/resources/hazelcast-declarative-eviction-test.xml
index 7e4a59a46..2662b5ee4 100644
--- a/jcache/src/main/resources/hazelcast-declarative-eviction-test.xml
+++ b/jcache/src/main/resources/hazelcast-declarative-eviction-test.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <cache name="cache">
diff --git a/jcache/src/main/resources/hazelcast-declarative-full.xml b/jcache/src/main/resources/hazelcast-declarative-full.xml
index 398b1dc64..a75e83fa5 100644
--- a/jcache/src/main/resources/hazelcast-declarative-full.xml
+++ b/jcache/src/main/resources/hazelcast-declarative-full.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <cache name="cache">
diff --git a/jcache/src/main/resources/hazelcast-declarative-listener-test.xml b/jcache/src/main/resources/hazelcast-declarative-listener-test.xml
index 9d8a58b1d..df878ca72 100644
--- a/jcache/src/main/resources/hazelcast-declarative-listener-test.xml
+++ b/jcache/src/main/resources/hazelcast-declarative-listener-test.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <cache name="cache">
diff --git a/jcache/src/main/resources/hazelcast-quorum.xml b/jcache/src/main/resources/hazelcast-quorum.xml
index bcea263d3..5703e7126 100644
--- a/jcache/src/main/resources/hazelcast-quorum.xml
+++ b/jcache/src/main/resources/hazelcast-quorum.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/jcache/src/main/resources/hazelcast-splitbrain.xml b/jcache/src/main/resources/hazelcast-splitbrain.xml
index 1ce3641ec..8b052fd84 100644
--- a/jcache/src/main/resources/hazelcast-splitbrain.xml
+++ b/jcache/src/main/resources/hazelcast-splitbrain.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/jcache/src/main/resources/hazelcast.xml b/jcache/src/main/resources/hazelcast.xml
index 5be22caca..db7039a3e 100644
--- a/jcache/src/main/resources/hazelcast.xml
+++ b/jcache/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/learning-basics/configure-logging/src/main/resources/hazelcast.xml b/learning-basics/configure-logging/src/main/resources/hazelcast.xml
index 7e6a4ef5e..ffa985bd5 100644
--- a/learning-basics/configure-logging/src/main/resources/hazelcast.xml
+++ b/learning-basics/configure-logging/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/learning-basics/configure-xml/src/main/resources/hazelcast-client-network-config.xml b/learning-basics/configure-xml/src/main/resources/hazelcast-client-network-config.xml
index 899c11504..7968b56fd 100644
--- a/learning-basics/configure-xml/src/main/resources/hazelcast-client-network-config.xml
+++ b/learning-basics/configure-xml/src/main/resources/hazelcast-client-network-config.xml
@@ -17,7 +17,7 @@
 
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <network>
diff --git a/learning-basics/configure-xml/src/main/resources/hazelcast-client.xml b/learning-basics/configure-xml/src/main/resources/hazelcast-client.xml
index e74188edc..a6821711c 100644
--- a/learning-basics/configure-xml/src/main/resources/hazelcast-client.xml
+++ b/learning-basics/configure-xml/src/main/resources/hazelcast-client.xml
@@ -17,7 +17,7 @@
 
 <hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
-                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
                   xmlns="http://www.hazelcast.com/schema/client-config">
 
     <import resource="hazelcast-client-network-config.xml"/>
diff --git a/learning-basics/configure-xml/src/main/resources/hazelcast-network-config.xml b/learning-basics/configure-xml/src/main/resources/hazelcast-network-config.xml
index 79036bb5b..0c74efd1c 100644
--- a/learning-basics/configure-xml/src/main/resources/hazelcast-network-config.xml
+++ b/learning-basics/configure-xml/src/main/resources/hazelcast-network-config.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/learning-basics/configure-xml/src/main/resources/hazelcast.xml b/learning-basics/configure-xml/src/main/resources/hazelcast.xml
index c00603c69..91c566b0f 100644
--- a/learning-basics/configure-xml/src/main/resources/hazelcast.xml
+++ b/learning-basics/configure-xml/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <import resource="hazelcast-network-config.xml"/>
diff --git a/learning-basics/destroying-instances/src/main/resources/hazelcast.xml b/learning-basics/destroying-instances/src/main/resources/hazelcast.xml
index 4c9be2431..a53bbe9b6 100644
--- a/learning-basics/destroying-instances/src/main/resources/hazelcast.xml
+++ b/learning-basics/destroying-instances/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/learning-basics/loading-instances/src/main/resources/hazelcast.xml b/learning-basics/loading-instances/src/main/resources/hazelcast.xml
index ace1e70e8..31e9aaa65 100644
--- a/learning-basics/loading-instances/src/main/resources/hazelcast.xml
+++ b/learning-basics/loading-instances/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <queue name="q"/>
diff --git a/learning-basics/wildcard-configuration/src/main/resources/hazelcast.xml b/learning-basics/wildcard-configuration/src/main/resources/hazelcast.xml
index a48df4495..8d54e62e3 100644
--- a/learning-basics/wildcard-configuration/src/main/resources/hazelcast.xml
+++ b/learning-basics/wildcard-configuration/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <map name="testmap*">
diff --git a/near-cache/fraud-detection/fraud-detection-client-with/src/main/resources/hazelcast-client.xml b/near-cache/fraud-detection/fraud-detection-client-with/src/main/resources/hazelcast-client.xml
index a0cae4282..8aeca0dfa 100644
--- a/near-cache/fraud-detection/fraud-detection-client-with/src/main/resources/hazelcast-client.xml
+++ b/near-cache/fraud-detection/fraud-detection-client-with/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.10.xsd"
-                  xmlns="http://www.hazelcast.com/schema/client-config"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
+                  xmlns="http://www.hazelcast.com/schema/client-config">
 
     <!-- This is the configuration for a client with a Near Cache.
       == ========================================================== ==
diff --git a/near-cache/fraud-detection/fraud-detection-client-without/src/main/resources/hazelcast-client.xml b/near-cache/fraud-detection/fraud-detection-client-without/src/main/resources/hazelcast-client.xml
index 5c735c7f1..6cb94ac48 100644
--- a/near-cache/fraud-detection/fraud-detection-client-without/src/main/resources/hazelcast-client.xml
+++ b/near-cache/fraud-detection/fraud-detection-client-without/src/main/resources/hazelcast-client.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hazelcast-client xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.10.xsd"
-                  xmlns="http://www.hazelcast.com/schema/client-config"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config
+                               http://www.hazelcast.com/schema/client-config/hazelcast-client-config-3.11.xsd"
+                  xmlns="http://www.hazelcast.com/schema/client-config">
 
     <!-- This is the configuration for a client without a Near Cache.
       == ========================================================== ==
diff --git a/near-cache/fraud-detection/fraud-detection-server/src/main/resources/hazelcast.xml b/near-cache/fraud-detection/fraud-detection-server/src/main/resources/hazelcast.xml
index afe81227d..7a08c0b0d 100644
--- a/near-cache/fraud-detection/fraud-detection-server/src/main/resources/hazelcast.xml
+++ b/near-cache/fraud-detection/fraud-detection-server/src/main/resources/hazelcast.xml
@@ -1,8 +1,9 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
 
-    <network>
+<network>
         <join>
             <multicast enabled="false"/>
             <tcp-ip enabled="true">
diff --git a/network-configuration/aws/src/main/resources/hazelcast.xml b/network-configuration/aws/src/main/resources/hazelcast.xml
index 31b1fc72c..81b3eb30e 100644
--- a/network-configuration/aws/src/main/resources/hazelcast.xml
+++ b/network-configuration/aws/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/firewall/src/main/resources/hazelcast.xml b/network-configuration/firewall/src/main/resources/hazelcast.xml
index d161e8e33..028a2d376 100644
--- a/network-configuration/firewall/src/main/resources/hazelcast.xml
+++ b/network-configuration/firewall/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/groups/group1/src/main/resources/hazelcast.xml b/network-configuration/groups/group1/src/main/resources/hazelcast.xml
index 61ec64de7..85e217a6c 100644
--- a/network-configuration/groups/group1/src/main/resources/hazelcast.xml
+++ b/network-configuration/groups/group1/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/network-configuration/groups/group2/src/main/resources/hazelcast.xml b/network-configuration/groups/group2/src/main/resources/hazelcast.xml
index 69ef86806..2971b4157 100644
--- a/network-configuration/groups/group2/src/main/resources/hazelcast.xml
+++ b/network-configuration/groups/group2/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
diff --git a/network-configuration/jclouds-partitiongroup/src/main/resources/hazelcast.xml b/network-configuration/jclouds-partitiongroup/src/main/resources/hazelcast.xml
index 048a6ac8c..201eb7bc7 100644
--- a/network-configuration/jclouds-partitiongroup/src/main/resources/hazelcast.xml
+++ b/network-configuration/jclouds-partitiongroup/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <properties>
diff --git a/network-configuration/jclouds/src/main/resources/hazelcast.xml b/network-configuration/jclouds/src/main/resources/hazelcast.xml
index 47b6ca9e5..6251d6091 100644
--- a/network-configuration/jclouds/src/main/resources/hazelcast.xml
+++ b/network-configuration/jclouds/src/main/resources/hazelcast.xml
@@ -16,7 +16,7 @@
   -->
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <properties>
diff --git a/network-configuration/multicast-plugin/src/main/resources/hazelcast.xml b/network-configuration/multicast-plugin/src/main/resources/hazelcast.xml
index a9cb5da37..b4792cb25 100644
--- a/network-configuration/multicast-plugin/src/main/resources/hazelcast.xml
+++ b/network-configuration/multicast-plugin/src/main/resources/hazelcast.xml
@@ -1,5 +1,6 @@
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/network-configuration/multicast/src/main/resources/hazelcast.xml b/network-configuration/multicast/src/main/resources/hazelcast.xml
index 7e6a4ef5e..ffa985bd5 100644
--- a/network-configuration/multicast/src/main/resources/hazelcast.xml
+++ b/network-configuration/multicast/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/partitiongroup/src/main/resources/hazelcast.xml b/network-configuration/partitiongroup/src/main/resources/hazelcast.xml
index c516f179d..8dc0bea3a 100644
--- a/network-configuration/partitiongroup/src/main/resources/hazelcast.xml
+++ b/network-configuration/partitiongroup/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/port/src/main/resources/hazelcast.xml b/network-configuration/port/src/main/resources/hazelcast.xml
index ff90f89b7..51a988d73 100644
--- a/network-configuration/port/src/main/resources/hazelcast.xml
+++ b/network-configuration/port/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/ssl/src/main/resources/hazelcast.xml b/network-configuration/ssl/src/main/resources/hazelcast.xml
index 387b6f4e9..a07e8592f 100644
--- a/network-configuration/ssl/src/main/resources/hazelcast.xml
+++ b/network-configuration/ssl/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/symmetric-encryption/src/main/resources/hazelcast.xml b/network-configuration/symmetric-encryption/src/main/resources/hazelcast.xml
index ac6cde19a..fbeb3e8af 100644
--- a/network-configuration/symmetric-encryption/src/main/resources/hazelcast.xml
+++ b/network-configuration/symmetric-encryption/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/network-configuration/tcpip/src/main/resources/hazelcast.xml b/network-configuration/tcpip/src/main/resources/hazelcast.xml
index 6c34f479c..53f3b7379 100644
--- a/network-configuration/tcpip/src/main/resources/hazelcast.xml
+++ b/network-configuration/tcpip/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/querying/project-key/src/main/resources/hazelcast.xml b/querying/project-key/src/main/resources/hazelcast.xml
index c52768436..857d479eb 100644
--- a/querying/project-key/src/main/resources/hazelcast.xml
+++ b/querying/project-key/src/main/resources/hazelcast.xml
@@ -1,7 +1,8 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-         
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
+
     <network>
         <join>
             <multicast enabled="false"/>
@@ -13,11 +14,11 @@
         </join>
     </network>
 
-	<map name="life">
-		<attributes>
-			<!-- This class builds a field called "age" -->
-        		<attribute extractor="com.hazelcast.samples.querying.domain.LifeAgeValueExtractor">age</attribute>
-        </attributes>		
-	</map>
-	
+    <map name="life">
+        <attributes>
+            <!-- This class builds a field called "age" -->
+            <attribute extractor="com.hazelcast.samples.querying.domain.LifeAgeValueExtractor">age</attribute>
+        </attributes>
+    </map>
+
 </hazelcast>
\ No newline at end of file
diff --git a/replicated-map/in-memory-format/src/main/resources/hazelcast.xml b/replicated-map/in-memory-format/src/main/resources/hazelcast.xml
index 12b91af95..f5f58e1e1 100644
--- a/replicated-map/in-memory-format/src/main/resources/hazelcast.xml
+++ b/replicated-map/in-memory-format/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
     <network>
         <join>
diff --git a/serialization/bytearray-serializer/src/main/resources/hazelcast.xml b/serialization/bytearray-serializer/src/main/resources/hazelcast.xml
index fd9adcdcc..65722fd1f 100644
--- a/serialization/bytearray-serializer/src/main/resources/hazelcast.xml
+++ b/serialization/bytearray-serializer/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/serialization/global-serializer/src/main/resources/hazelcast.xml b/serialization/global-serializer/src/main/resources/hazelcast.xml
index 42dfa7386..9b734db37 100644
--- a/serialization/global-serializer/src/main/resources/hazelcast.xml
+++ b/serialization/global-serializer/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/serialization/hazelcast-airlines/grid-node/src/main/resources/hazelcast.xml b/serialization/hazelcast-airlines/grid-node/src/main/resources/hazelcast.xml
index bfbf3d40b..cc2e4134e 100644
--- a/serialization/hazelcast-airlines/grid-node/src/main/resources/hazelcast.xml
+++ b/serialization/hazelcast-airlines/grid-node/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
         <join>
@@ -13,18 +14,20 @@
         </join>
     </network>
 
-	<!-- Serialization configuration -->
-	<!-- =========================== -->
-	<!-- Factory IDs must match the code,                                                -->
-	<!--  see com.hazelcast.samples.serialization.hazelcast.airlines.util.Constants.java -->
-	<serialization>
-		<data-serializable-factories>
-			<data-serializable-factory factory-id="1">com.hazelcast.samples.serialization.hazelcast.airlines.util.MyDataSerializableFactory</data-serializable-factory>
-		</data-serializable-factories>
-		<serializers>
-			<!-- V5Flight is serialized/deserialized by V5FlightSerializer -->
-			<serializer type-class="com.hazelcast.samples.serialization.hazelcast.airlines.V5Flight"
-				class-name="com.hazelcast.samples.serialization.hazelcast.airlines.V5FlightSerializer"/>
-		</serializers>
-	</serialization>    
+    <!-- Serialization configuration -->
+    <!-- =========================== -->
+    <!-- Factory IDs must match the code,                                                -->
+    <!--  see com.hazelcast.samples.serialization.hazelcast.airlines.util.Constants.java -->
+    <serialization>
+        <data-serializable-factories>
+            <data-serializable-factory factory-id="1">
+                com.hazelcast.samples.serialization.hazelcast.airlines.util.MyDataSerializableFactory
+            </data-serializable-factory>
+        </data-serializable-factories>
+        <serializers>
+            <!-- V5Flight is serialized/deserialized by V5FlightSerializer -->
+            <serializer type-class="com.hazelcast.samples.serialization.hazelcast.airlines.V5Flight"
+                        class-name="com.hazelcast.samples.serialization.hazelcast.airlines.V5FlightSerializer"/>
+        </serializers>
+    </serialization>
 </hazelcast>
\ No newline at end of file
diff --git a/serialization/identified-data-serializable/src/main/resources/hazelcast.xml b/serialization/identified-data-serializable/src/main/resources/hazelcast.xml
index aa09e14d0..a23216d7d 100644
--- a/serialization/identified-data-serializable/src/main/resources/hazelcast.xml
+++ b/serialization/identified-data-serializable/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/serialization/kryo-serializer/src/main/resources/hazelcast.xml b/serialization/kryo-serializer/src/main/resources/hazelcast.xml
index 76c985dac..56f83d2d8 100644
--- a/serialization/kryo-serializer/src/main/resources/hazelcast.xml
+++ b/serialization/kryo-serializer/src/main/resources/hazelcast.xml
@@ -1,11 +1,11 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
         <serializers>
-            <serializer type-class="Person" class-name="PersonKryoSerializer" />
+            <serializer type-class="Person" class-name="PersonKryoSerializer"/>
         </serializers>
     </serialization>
 </hazelcast>
diff --git a/serialization/portable/src/main/resources/hazelcast.xml b/serialization/portable/src/main/resources/hazelcast.xml
index 0b1253c90..2a0bfa1b6 100644
--- a/serialization/portable/src/main/resources/hazelcast.xml
+++ b/serialization/portable/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/serialization/protobuf-serializer/src/main/resources/hazelcast.xml b/serialization/protobuf-serializer/src/main/resources/hazelcast.xml
index a9df7757a..ea38a6a2b 100644
--- a/serialization/protobuf-serializer/src/main/resources/hazelcast.xml
+++ b/serialization/protobuf-serializer/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast
-        xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+        xsi:schemaLocation="http://www.hazelcast.com/schema/config
+        http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
         xmlns="http://www.hazelcast.com/schema/config"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/serialization/stream-serializer/src/main/resources/hazelcast.xml b/serialization/stream-serializer/src/main/resources/hazelcast.xml
index 3f543ffab..585101c0c 100644
--- a/serialization/stream-serializer/src/main/resources/hazelcast.xml
+++ b/serialization/stream-serializer/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <serialization>
diff --git a/spi/backups/src/main/resources/hazelcast.xml b/spi/backups/src/main/resources/hazelcast.xml
index af7b86044..94f20364c 100644
--- a/spi/backups/src/main/resources/hazelcast.xml
+++ b/spi/backups/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/spi/container/src/main/resources/hazelcast.xml b/spi/container/src/main/resources/hazelcast.xml
index af7b86044..94f20364c 100644
--- a/spi/container/src/main/resources/hazelcast.xml
+++ b/spi/container/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/spi/discovery/src/main/resources/hazelcast.xml b/spi/discovery/src/main/resources/hazelcast.xml
index 200d5970b..4c9047e73 100644
--- a/spi/discovery/src/main/resources/hazelcast.xml
+++ b/spi/discovery/src/main/resources/hazelcast.xml
@@ -14,10 +14,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <!-- activate Discovery SPI -->
diff --git a/spi/getting-started/src/main/resources/hazelcast.xml b/spi/getting-started/src/main/resources/hazelcast.xml
index af7b86044..94f20364c 100644
--- a/spi/getting-started/src/main/resources/hazelcast.xml
+++ b/spi/getting-started/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/spi/notification/src/main/resources/hazelcast.xml b/spi/notification/src/main/resources/hazelcast.xml
index 9c9d6d2c7..6e70f4dbb 100644
--- a/spi/notification/src/main/resources/hazelcast.xml
+++ b/spi/notification/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/spi/partition-migration/src/main/resources/hazelcast.xml b/spi/partition-migration/src/main/resources/hazelcast.xml
index af7b86044..94f20364c 100644
--- a/spi/partition-migration/src/main/resources/hazelcast.xml
+++ b/spi/partition-migration/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/spi/priority-queue/priority-queue-server/src/main/resources/hazelcast.xml b/spi/priority-queue/priority-queue-server/src/main/resources/hazelcast.xml
index 5319ea245..1ab8b474e 100644
--- a/spi/priority-queue/priority-queue-server/src/main/resources/hazelcast.xml
+++ b/spi/priority-queue/priority-queue-server/src/main/resources/hazelcast.xml
@@ -1,6 +1,7 @@
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
 
     <!-- Just network specification here. Extra stuff in ApplicationConfig.java -->
 
diff --git a/spi/proxy/src/main/resources/hazelcast.xml b/spi/proxy/src/main/resources/hazelcast.xml
index 9c9d6d2c7..6e70f4dbb 100644
--- a/spi/proxy/src/main/resources/hazelcast.xml
+++ b/spi/proxy/src/main/resources/hazelcast.xml
@@ -1,6 +1,6 @@
 <hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.hazelcast.com/schema/config
-                               http://www.hazelcast.com/schema/config/hazelcast-config-3.10.xsd"
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
            xmlns="http://www.hazelcast.com/schema/config">
 
     <network>
diff --git a/variable-replacers/hazelcast-exec-linux.xml b/variable-replacers/hazelcast-exec-linux.xml
index 324267d05..287794589 100644
--- a/variable-replacers/hazelcast-exec-linux.xml
+++ b/variable-replacers/hazelcast-exec-linux.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
-    <config-replacers >
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
+
+    <config-replacers>
         <replacer class-name="com.hazelcast.sample.replacer.ExecReplacer"/>
     </config-replacers>
 
diff --git a/variable-replacers/hazelcast-exec-windows.xml b/variable-replacers/hazelcast-exec-windows.xml
index 60085d8a0..9f61223d5 100644
--- a/variable-replacers/hazelcast-exec-windows.xml
+++ b/variable-replacers/hazelcast-exec-windows.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
-    <config-replacers >
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
+
+    <config-replacers>
         <replacer class-name="com.hazelcast.sample.replacer.ExecReplacer">
             <properties>
                 <property name="argumentSeparator">#</property>
diff --git a/variable-replacers/hazelcast-plain.xml b/variable-replacers/hazelcast-plain.xml
index 4dc3fbb7a..646638159 100644
--- a/variable-replacers/hazelcast-plain.xml
+++ b/variable-replacers/hazelcast-plain.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
 
     <group>
         <name>Variable Test Group</name>
diff --git a/variable-replacers/hazelcast-with-replacers.xml b/variable-replacers/hazelcast-with-replacers.xml
index 1e20af0d5..a4c757e42 100644
--- a/variable-replacers/hazelcast-with-replacers.xml
+++ b/variable-replacers/hazelcast-with-replacers.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.10.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
-    <config-replacers >
+<hazelcast xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://www.hazelcast.com/schema/config
+                               http://www.hazelcast.com/schema/config/hazelcast-config-3.11.xsd"
+           xmlns="http://www.hazelcast.com/schema/config">
+
+    <config-replacers>
         <replacer class-name="com.hazelcast.config.replacer.EncryptionReplacer">
             <properties>
                 <property name="passwordFile">password.txt</property>