diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2020-03-17 21:34:10 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2020-03-21 20:04:02 +0000 |
| commit | 4ae5d153538617c36d738c5bd322630dbbba980a (patch) | |
| tree | ba6e5acd44ba6a5d132058d6a35a5c432f424f68 | |
| parent | 1b854b3c1bb76bde457a3167e0708a8c9ede2cec (diff) | |
| download | sonarqube-4ae5d153538617c36d738c5bd322630dbbba980a.tar.gz sonarqube-4ae5d153538617c36d738c5bd322630dbbba980a.zip | |
SONAR-13155 upgrade gson from 2.8.5 to 2.8.6
No major changes
https://github.com/google/gson/blob/master/CHANGELOG.md
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ws/TreeActionTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
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); |