SONAR-12358 fix SSF 85

diff --git a/build.gradle b/build.gradle
index c57e29497074a4baf335579315832c45288ee4c3..b01867b66f61d21f06445de8f83a7f66b67d0287 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.8.6') {
+      dependencySet(group: 'com.hazelcast', version: '3.12.1') {
         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 1f675ed53d4b6e73aec5d6b2ca60aa9c0a6fb9b2..0e64ffc32d38469ddec5130ec943d7fae4349405 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.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;

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index 46ee22e8e4af74a115246e77beb32b99023b5b16..3aacb7f9a0a3bec846e9b35879ae40012cdc8140 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -211,7 +211,7 @@ zip.doFirst {
 // Check the size of the archive
 zip.doLast {
   def minLength = 198000000
-  def maxLength = 208000000
+  def maxLength = 210000000
   def length = archiveFile.get().asFile.length()
   if (length < minLength)
     throw new GradleException("$archiveName size ($length) too small. Min is $minLength")