Revert "SONAR-12358 fix SSF 85"

This reverts commit 659dc21781b018f5197fa432217e5959044eef7e.

diff --git a/build.gradle b/build.gradle
index 004b35ac8f8aae46e5a1f3b5605e574144cf1f06..9ce55594e387d9b0d01d4188f2fc9b73f32a66f0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -137,7 +137,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.12.1') {
+      dependencySet(group: 'com.hazelcast', version: '3.8.6') {
         entry 'hazelcast'
         entry 'hazelcast-client'
       }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
index 0e64ffc32d38469ddec5130ec943d7fae4349405..1f675ed53d4b6e73aec5d6b2ca60aa9c0a6fb9b2 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java
+++ b/server/sonar-server/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.internal.json.Json;
-import com.hazelcast.internal.json.JsonObject;
+import com.hazelcast.com.eclipsesource.json.Json;
+import com.hazelcast.com.eclipsesource.json.JsonObject;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;