SONAR-12358 upgrade hazelcast

diff --git a/build.gradle b/build.gradle
index 1cb2102ad0f442a53c6d298ec96d8c4feed77289..290ce4d7ffbe305f4a53889748246cd999691e19 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -171,7 +171,7 @@ subprojects {
       dependency 'com.google.guava:guava:18.0'
       dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
       dependency 'com.h2database:h2:1.3.176'
-      dependencySet(group: 'com.hazelcast', version: '3.8.6') {
+      dependencySet(group: 'com.hazelcast', version: '3.12.1') {
         entry 'hazelcast'
         entry 'hazelcast-client'
       }

diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
index c562dab62cd6f34322f3adbaf9d80482fe27cbe2..d46ce356eab050ffd2112dd2cc215cea72ea7ecf 100644 (file)
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
@@ -20,8 +20,8 @@
 package org.sonar.server.plugins.ws;
 
 import com.google.common.base.Optional;
-import com.hazelcast.com.eclipsesource.json.Json;
-import com.hazelcast.com.eclipsesource.json.JsonObject;
+import com.hazelcast.internal.json.Json;
+import com.hazelcast.internal.json.JsonObject;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -74,6 +74,20 @@ public class InstalledActionTest {
   private InstalledAction underTest = new InstalledAction(pluginFileSystem, updateCenterMatrixFactory, db.getDbClient());
   private WsActionTester tester = new WsActionTester(underTest);
 
+  @DataProvider
+  public static Object[][] editionBundledLicenseValues() {
+    return new Object[][] {
+      {"sonarsource"},
+      {"SonarSource"},
+      {"SonaRSOUrce"},
+      {"SONARSOURCE"},
+      {"commercial"},
+      {"Commercial"},
+      {"COMMERCIAL"},
+      {"COmmERCiaL"},
+    };
+  }
+
   @Test
   public void action_installed_is_defined() {
     Action action = tester.getDef();
@@ -376,20 +390,6 @@ public class InstalledActionTest {
         "}");
   }
 
-  @DataProvider
-  public static Object[][] editionBundledLicenseValues() {
-    return new Object[][]{
-      {"sonarsource"},
-      {"SonarSource"},
-      {"SonaRSOUrce"},
-      {"SONARSOURCE"},
-      {"commercial"},
-      {"Commercial"},
-      {"COMMERCIAL"},
-      {"COmmERCiaL"},
-    };
-  }
-
   @Test
   public void only_one_plugin_can_have_a_specific_name_and_key() throws IOException {
     when(pluginFileSystem.getInstalledFiles()).thenReturn(