From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 17 Mar 2020 20:34:10 +0000 (+0100)
Subject: SONAR-13155 upgrade gson from 2.8.5 to 2.8.6
X-Git-Tag: 8.3.0.34182~103
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4ae5d153538617c36d738c5bd322630dbbba980a;p=sonarqube.git

SONAR-13155 upgrade gson from 2.8.5 to 2.8.6

No major changes
https://github.com/google/gson/blob/master/CHANGELOG.md
---

diff --git a/build.gradle b/build.gradle
index 51f1961ceeb..c608205335d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,7 +185,7 @@ subprojects {
         exclude 'junit:junit'
       }
       dependency 'com.google.code.findbugs:jsr305:3.0.2'
-      dependency 'com.google.code.gson:gson:2.8.5'
+      dependency 'com.google.code.gson:gson:2.8.6'
       dependency('com.google.guava:guava:28.2-jre') {
         exclude 'com.google.errorprone:error_prone_annotations'
         exclude 'com.google.guava:listenablefuture'
diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
index 3e121c0bd14..321fd80c336 100644
--- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
+++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java
@@ -541,7 +541,7 @@ public class TreeActionTest {
 
     Date now = new Date();
     JsonParser jsonParser = new JsonParser();
-    JsonElement jsonTree = jsonParser.parse(IOUtils.toString(getClass().getResource("tree-example.json"), UTF_8));
+    JsonElement jsonTree = jsonParser.parseString(IOUtils.toString(getClass().getResource("tree-example.json"), UTF_8));
     JsonArray components = jsonTree.getAsJsonObject().getAsJsonArray("components");
     for (int i = 0; i < components.size(); i++) {
       JsonElement componentAsJsonElement = components.get(i);