Commit a045ca7c authored by Tigran Mkrtchyan's avatar Tigran Mkrtchyan
Browse files

libs: migrate to hazelcast-4.1.8

future release with improvements and fixes

see: https://github.com/hazelcast/hazelcast/releases/tag/v4.1

Obseletes: PR#111
Acked-by: Paul Millar
Target: master
parent 06cebe9e
Pipeline #19773 passed with stage
in 1 minute and 53 seconds
......@@ -29,11 +29,6 @@
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
......
/*
* Copyright (c) 2017 - 2020 Deutsches Elektronen-Synchroton,
* Copyright (c) 2017 - 2022 Deutsches Elektronen-Synchroton,
* Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY
*
* This library is free software; you can redistribute it and/or modify
......@@ -20,8 +20,7 @@
package org.dcache.nfs.v4.nlm;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.core.MultiMap;
import com.hazelcast.multimap.MultiMap;
import java.util.Base64;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
......
......@@ -33,7 +33,7 @@ public class DistributedLockManagerTest {
"127.0.0.1:" + hzSerrver.getCluster().getLocalMember().getAddress().getPort())
);
config.getGroupConfig().setName(hzSerrver.getConfig().getGroupConfig().getName());
config.setClusterName(hzSerrver.getConfig().getClusterName());
hzClient = HazelcastClient.newHazelcastClient(config);
lm1 = new DistributedLockManager(hzClient, "distributed-byte-range-lock");
lm2 = new DistributedLockManager(hzClient, "distributed-byte-range-lock");
......
<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-4.1.xsd"
xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<group>
<name>nfs-dlm-test</name>
</group>
<cluster-name>nfs-dlm-test</cluster-name>
<properties>
<property name="hazelcast.logging.type">slf4j</property>
......
......@@ -199,12 +199,7 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>3.9.2</version>
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-client</artifactId>
<version>3.9.2</version>
<version>4.1.8</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment