Docker build (4.0.2) commit

Author: PicoCreator

docker/javacommons-hazelcast/Dockerfile

@@ -26,7 +26,7 @@ RUN ls /workspace/built-jars/
 #
 # Now we got JAR's - time to setup hazelcast
 #
-FROM hazelcast/hazelcast:3.11.4 as javacommons-hazelcast
+FROM hazelcast/hazelcast:4.0.2 as javacommons-hazelcast
 
 # Copy over the relevent classpath
 ENV CLASSPATH="/opt/hazelcast/CLASSPATH_EXT:/opt/hazelcast/CLASSPATH_EXT/*"
@@ -35,8 +35,8 @@ COPY --from=builder /workspace/built-jars/* /opt/hazelcast/CLASSPATH_EXT/
 # Adding custom hazelcast.xml
 ADD hazelcast.xml /hazelcast.xml
 
-# group name support (also known as cluster name)
-ENV GROUP_NAME "hazelcast"
+# cluster name support (also known as cluster name)
+ENV CLUSTER_NAME "hazelcast"
 
 # minimum init cluster size and wait timing
 ENV CLUSTER_INIT_MIN_SIZE  2

docker/javacommons-hazelcast/hazelcast.xml

@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2008-2015, Hazelcast, Inc. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  Hazelcast config - specific for javacommons build, using DNS discovery
   -->
-
-<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.9.xsd"
-           xmlns="http://www.hazelcast.com/schema/config"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<!--suppress XmlDefaultAttributeValue -->
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+           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-4.1.xsd">
     <!-- 
-      Hazelcast group name support - note this is to be deprecated as "clustername" in future
-      See: https://docs.hazelcast.org/docs/latest-dev/manual/html-single/#changes-in-security-configurations
+      Hazelcast cluster name support
     -->
-    <group>
-        <name>${env.GROUP_NAME}</name>
-    </group>
+    <cluster-name>${env.CLUSTER_NAME}</cluster-name>
 
     <!-- 
       Enable DNS based discovery