[sre] Upgrade to Hazelcast 3.11.2

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Mar 21, 2019 · a3c191e · a3c191e
1 parent 8859103
commit a3c191e
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 7 deletions.
diff --git a/main/targetplatform/io.sarl.lang.targetplatform.target b/main/targetplatform/io.sarl.lang.targetplatform.target
@@ -42,10 +42,10 @@
 			<unit id="com.google.gson" version="2.8.5"/>
 			<unit id="com.google.inject" version="4.1.0"/>
 			<unit id="com.google.inject.multibindings" version="4.1.0"/>
-			<unit id="com.hazelcast" version="3.9.0.EA"/>
 			<unit id="org.zeromq.jeromq" version="0.4.2"/>
-			<repository location="http://dependencies.sarl.io"/>
+			<unit id="com.hazelcast" version="3.11.2"/>
 			<unit id="javax.inject" version="1.0.0"/>
+			<repository location="http://dependencies.sarl.io"/>
 		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

diff --git a/pom.xml b/pom.xml
@@ -437,7 +437,7 @@
 			<dependency>
 				<groupId>com.hazelcast</groupId>
 				<artifactId>hazelcast</artifactId>
-				<version>3.9-EA</version>
+				<version>3.11.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.zeromq</groupId>

diff --git a/sre/io.janusproject/io.janusproject.feature/feature.xml b/sre/io.janusproject/io.janusproject.feature/feature.xml
@@ -226,10 +226,11 @@
       <import plugin="io.sarl.util" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.javafx" version="0.9.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.13.100" match="greaterOrEqual"/>
-      <import plugin="com.hazelcast" version="3.9.0" match="greaterOrEqual"/>
       <import plugin="org.zeromq.jeromq" version="0.4.2" match="greaterOrEqual"/>
       <import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.cli" version="1.4.0" match="greaterOrEqual"/>
+      <import plugin="org.arakhne.afc.core.vmutils" version="15.2.0" match="greaterOrEqual"/>
+      <import plugin="org.arakhne.afc.core.util" version="15.2.0" match="greaterOrEqual"/>
       <import plugin="com.google.gson" version="2.8.5" match="greaterOrEqual"/>
       <import plugin="javax.inject" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="aopalliance" version="1.0.0" match="greaterOrEqual"/>
@@ -242,8 +243,7 @@
       <import plugin="org.eclipse.jface" version="3.14.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.swt" version="3.108.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.launching" version="3.11.0" match="greaterOrEqual"/>
-      <import plugin="org.arakhne.afc.core.vmutils" version="15.2.0" match="greaterOrEqual"/>
-      <import plugin="org.arakhne.afc.core.util" version="15.2.0" match="greaterOrEqual"/>
+      <import plugin="com.hazelcast" version="3.11.2" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Require-Bundle: io.sarl.core;bundle-version="0.9.0",
  io.sarl.util;bundle-version="0.9.0",
  io.sarl.javafx;bundle-version="0.9.0",
  org.eclipse.osgi;bundle-version="3.13.100",
- com.hazelcast;bundle-version="3.9.0",
  org.zeromq.jeromq;bundle-version="0.4.2",
+ com.hazelcast;bundle-version="3.11.2",
  com.google.inject;bundle-version="4.1.0",
  org.apache.commons.cli;bundle-version="1.4.0",
  org.arakhne.afc.core.vmutils;bundle-version="15.2.0",

diff --git a/...t.tests/src/test/java/io/janusproject/tests/modules/hazelcast/AbstractSerializerTest.java b/...t.tests/src/test/java/io/janusproject/tests/modules/hazelcast/AbstractSerializerTest.java
@@ -28,10 +28,12 @@
 import java.io.ObjectOutputStream;
 import java.nio.ByteOrder;
 
+import com.hazelcast.internal.serialization.InternalSerializationService;
 import com.hazelcast.nio.ObjectDataInput;
 import com.hazelcast.nio.ObjectDataOutput;
 import com.hazelcast.nio.serialization.Data;
 import com.hazelcast.nio.serialization.StreamSerializer;
+import com.hazelcast.spi.serialization.SerializationService;
 import com.hazelcast.version.Version;
 
 import io.janusproject.tests.testutils.AbstractJanusTest;
@@ -208,6 +210,11 @@ public byte[] toByteArray(int padding) {
 			return content;
 		}
 
+		@Override
+		public SerializationService getSerializationService() {
+			throw new UnsupportedOperationException();
+		}
+
 	}
 
 	/**
@@ -385,6 +392,11 @@ public Version getVersion() {
 			return Version.UNKNOWN;
 		}
 
+		@Override
+		public InternalSerializationService getSerializationService() {
+			throw new UnsupportedOperationException();
+		}
+
 	}
 
 }
diff --git a/...roject/io.janusproject.tests/src/test/java/io/janusproject/tests/testutils/HzMapMock.java b/...roject/io.janusproject.tests/src/test/java/io/janusproject/tests/testutils/HzMapMock.java
@@ -466,4 +466,39 @@ public void removeAll(Predicate<K, V> arg0) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public V put(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public ICompletableFuture<V> putAsync(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public V putIfAbsent(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void putTransient(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void set(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public ICompletableFuture<Void> setAsync(K arg0, V arg1, long arg2, TimeUnit arg3, long arg4, TimeUnit arg5) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean setTtl(K arg0, long arg1, TimeUnit arg2) {
+		throw new UnsupportedOperationException();
+	}
+
 }
diff --git a/...t/io.janusproject.tests/src/test/java/io/janusproject/tests/testutils/HzMultiMapMock.java b/...t/io.janusproject.tests/src/test/java/io/janusproject/tests/testutils/HzMultiMapMock.java
@@ -251,6 +251,11 @@ public <SuppliedValue, Result> Result aggregate(com.hazelcast.mapreduce.aggregat
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public void delete(Object arg0) {
+		throw new UnsupportedOperationException();
+	}
+
 	/**
 	 * @author $Author: sgalland$
 	 * @version $FullVersion$