Replace json-simple by gson in sonar-batch

1 files changed, 7 insertions, 4 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
index 29d9474c394..2b36425b15d 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/bootstrap/BatchSettings.java
@@ -19,9 +19,10 @@
  */
 package org.sonar.batch.bootstrap;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.configuration.Configuration;
 import org.apache.commons.lang.StringUtils;
-import org.json.simple.JSONValue;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.CoreProperties;
 import org.sonar.api.batch.bootstrap.ProjectReactor;
@@ -30,7 +31,6 @@ import org.sonar.api.config.Settings;
 import org.sonar.api.utils.SonarException;
 
 import javax.annotation.Nullable;
-
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +45,7 @@ public class BatchSettings extends Settings {
   private Map<String, String> savedProperties;
 
   public BatchSettings(BootstrapSettings bootstrapSettings, PropertyDefinitions propertyDefinitions,
-    ServerClient client, Configuration deprecatedConfiguration, AnalysisMode mode) {
+                       ServerClient client, Configuration deprecatedConfiguration, AnalysisMode mode) {
 
     super(propertyDefinitions);
     this.mode = mode;
@@ -96,7 +96,10 @@ public class BatchSettings extends Settings {
       url = BATCH_BOOTSTRAP_PROPERTIES_URL + "?dryRun=" + preview;
     }
     String jsonText = client.request(url);
-    List<Map<String, String>> json = (List<Map<String, String>>) JSONValue.parse(jsonText);
+
+    List<Map<String, String>> json = new Gson().fromJson(jsonText, new TypeToken<List<Map<String, String>>>() {
+    }.getType());
+
     for (Map<String, String> jsonProperty : json) {
       String key = jsonProperty.get("k");
       String value = jsonProperty.get("v");