bumping HC to 3.6.4

neo4j · Aug 12, 2016 · abc65a0 · abc65a0
1 parent f472221
commit abc65a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/enterprise/core-edge/pom.xml b/enterprise/core-edge/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast-all</artifactId>
-            <version>3.5.1</version>
+            <version>3.6.4</version>
             <exclusions>
                 <exclusion>
                     <groupId>net.sourceforge.findbugs</groupId>

diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClientTest.java
@@ -248,12 +248,6 @@ public HazelcastSet(  )
             this.delegate = new HashSet<>(  );
         }
 
-        @Override
-        public Object getId()
-        {
-            throw new IllegalStateException();
-        }
-
         @Override
         public String getPartitionKey()
         {

diff --git a/...se/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java b/...se/core-edge/src/test/java/org/neo4j/coreedge/discovery/HazelcastClusterTopologyTest.java
@@ -116,7 +116,7 @@ public void shouldStoreMemberIdentityAndAddressesAsMemberAttributes() throws Exc
 
         // when
         Map<String, Object> attributes = buildMemberAttributes( memberId, config ).getAttributes();
-        Pair<MemberId, CoreAddresses> extracted = extractMemberAttributes( new MemberImpl( null, null, attributes ) );
+        Pair<MemberId, CoreAddresses> extracted = extractMemberAttributes( new MemberImpl( null, null, attributes, false ) );
 
         // then
         assertEquals( memberId, extracted.first() );
@@ -142,8 +142,9 @@ public void shouldCollectMembersAsAMap() throws Exception
             settings.put( CoreEdgeClusterSettings.raft_advertised_address.name(), "raft:" + (i + 1) );
             settings.put( GraphDatabaseSettings.bolt_advertised_address.name(), "bolt:" + (i + 1) );
             config.augment( settings );
+            Map<String, Object> attributes = buildMemberAttributes( memberId, config ).getAttributes();
             hazelcastMembers.add( new MemberImpl( new Address( "localhost", i ), null,
-                    buildMemberAttributes( memberId, config ).getAttributes() ) );
+                    attributes, false )  );
         }
 
         // when
@@ -175,7 +176,7 @@ public void shouldLogAndExcludeMembersWithMissingAttributes() throws Exception
             {
                 attributes.remove( HazelcastClusterTopology.RAFT_SERVER );
             }
-            hazelcastMembers.add( new MemberImpl( new Address( "localhost", i ), null, attributes ) );
+            hazelcastMembers.add( new MemberImpl( new Address( "localhost", i ), null, attributes, false ) );
         }
         // when
         Map<MemberId, CoreAddresses> map =