Upgrade various libraries

diff --git a/build.gradle b/build.gradle
index e94fb0b6512fb8b8ab55178590c6b5a1cf7b0725..094e92f0fe88c9b50ef1adbe0d36a8cc2af91de0 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ subprojects {
       dependency 'commons-codec:commons-codec:1.8'
       dependency 'commons-dbcp:commons-dbcp:1.4'
       dependency 'commons-dbutils:commons-dbutils:1.5'
-      dependency 'commons-io:commons-io:2.4'
+      dependency 'commons-io:commons-io:2.6'
       dependency 'commons-lang:commons-lang:2.6'
       dependencySet(group: 'com.fasterxml.jackson.core', version: '2.9.5') {
         entry 'jackson-core'
@@ -108,7 +108,7 @@ subprojects {
         exclude 'junit:junit'
       }
       dependency 'com.google.code.findbugs:jsr305:3.0.2'
-      dependency 'com.google.code.gson:gson:2.3.1'
+      dependency 'com.google.code.gson:gson:2.8.4'
       dependency 'com.google.guava:guava:18.0'
       dependency "com.google.protobuf:protobuf-java:${protobufVersion}"
       dependency 'com.h2database:h2:1.3.176'
@@ -147,8 +147,8 @@ subprojects {
           exclude 'org.eclipse.jdt.core.compiler:ecj'
         }
       }
-      dependency 'org.assertj:assertj-core:3.9.0'
-      dependency 'org.assertj:assertj-guava:3.1.0'
+      dependency 'org.assertj:assertj-core:3.9.1'
+      dependency 'org.assertj:assertj-guava:3.2.0'
       dependency('org.codehaus.sonar:sonar-channel:4.1') {
         exclude 'org.slf4j:slf4j-api'
       }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java
index 1708534ab34902b1a33a05f62ca11b724928c192..6ab94994138ef2a1aca62715f7f09778e478234e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java
@@ -38,6 +38,8 @@ import org.sonar.core.util.LineReaderIterator;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 public class BatchReportReaderImpl implements BatchReportReader {
 
   private final BatchReportDirectoryHolder batchReportDirectoryHolder;
@@ -72,7 +74,7 @@ public class BatchReportReaderImpl implements BatchReportReader {
       return CloseableIterator.emptyCloseableIterator();
     }
     try {
-      InputStreamReader reader = new InputStreamReader(FileUtils.openInputStream(file), StandardCharsets.UTF_8);
+      InputStreamReader reader = new InputStreamReader(FileUtils.openInputStream(file), UTF_8);
       return new LineReaderIterator(reader);
     } catch (IOException e) {
       throw new IllegalStateException("Fail to open file " + file, e);
@@ -155,7 +157,7 @@ public class BatchReportReaderImpl implements BatchReportReader {
     }
 
     try {
-      return Optional.of(new CloseableLineIterator(IOUtils.lineIterator(FileUtils.openInputStream(file), StandardCharsets.UTF_8)));
+      return Optional.of(new CloseableLineIterator(IOUtils.lineIterator(FileUtils.openInputStream(file), UTF_8)));
     } catch (IOException e) {
       throw new IllegalStateException("Fail to traverse file: " + file, e);
     }
@@ -185,7 +187,7 @@ public class BatchReportReaderImpl implements BatchReportReader {
     }
 
     @Override
-    protected void doClose() {
+    protected void doClose() throws IOException {
       lineIterator.close();
     }
   }

diff --git a/tests/build.gradle b/tests/build.gradle
index 1d9605e8593cb23b0538946728414e25c6472baa..9fa0ac5763f4683981c487f8e400e7dff7137406 100644 (file)
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -62,7 +62,7 @@ dependencies {
   testCompile 'org.eclipse.jetty:jetty-servlet'
   testCompile "org.jboss.byteman:byteman-submit:${bytemanVersion}"
   testCompile 'org.postgresql:postgresql'
-  testCompile 'org.skyscreamer:jsonassert:1.2.0'
+  testCompile 'org.skyscreamer:jsonassert:1.5.0'
   testCompile 'org.sonarsource.orchestrator:sonar-orchestrator'
   testCompile 'org.subethamail:subethasmtp'
   testCompile project(':server:sonar-qa-util')

diff --git a/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json b/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
index c2f25a610a93c54a6bed24949a6a18569548fc41..5a6eee1619c358015c86aed6b02bd6ca90e7895a 100644 (file)
--- a/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
@@ -2,23 +2,23 @@
   "sources":[
     {
       "line": 1,
-      "code": "package sample;",
+      "code": "package sample;"
     },
     {
       "line": 2,
-      "code": "",
+      "code": ""
     },
     {
       "line": 3,
-      "code": "public class Sample {",
+      "code": "public class Sample {"
     },
     {
       "line": 4,
-      "code": "\t",
+      "code": "\t"
     },
     {
       "line": 5,
-      "code": "\tpublic Sample(int i) {",
+      "code": "\tpublic Sample(int i) {"
     },
     {
       "line": 6,
@@ -28,15 +28,15 @@
     },
     {
       "line": 7,
-      "code": "\t}",
+      "code": "\t}"
     },
     {
       "line": 8,
-      "code": "\t",
+      "code": "\t"
     },
     {
       "line": 9,
-      "code": "\tprivate String myMethod() {",
+      "code": "\tprivate String myMethod() {"
     },
     {
       "line": 10,
@@ -56,7 +56,7 @@
     },
     {
       "line": 12,
-      "code": "\t\t} else {",
+      "code": "\t\t} else {"
     },
     {
       "line": 13,
@@ -66,19 +66,19 @@
     },
     {
       "line": 14,
-      "code": "\t\t}",
+      "code": "\t\t}"
     },
     {
       "line": 15,
-      "code": "\t}",
+      "code": "\t}"
     },
     {
       "line": 16,
-      "code": "}",
+      "code": "}"
     },
     {
       "line": 17,
-      "code": "",
+      "code": ""
     }
   ]
 }

diff --git a/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json b/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
index aabf73102ff176c41793b6e443e8c21569d2fb48..21a92e29365ad0f744fc82a803c7aa1d256d5ce3 100644 (file)
--- a/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
@@ -2,23 +2,23 @@
   "sources": [
     {
       "line": 1,
-      "code": "package sample;",
+      "code": "package sample;"
     },
     {
       "line": 2,
-      "code": "",
+      "code": ""
     },
     {
       "line": 3,
-      "code": "public class Sample {",
+      "code": "public class Sample {"
     },
     {
       "line": 4,
-      "code": "\t",
+      "code": "\t"
     },
     {
       "line": 5,
-      "code": "\tpublic Sample(int i) {",
+      "code": "\tpublic Sample(int i) {"
     },
     {
       "line": 6,
@@ -28,15 +28,15 @@
     },
     {
       "line": 7,
-      "code": "\t}",
+      "code": "\t}"
     },
     {
       "line": 8,
-      "code": "\t",
+      "code": "\t"
     },
     {
       "line": 9,
-      "code": "\tprivate String myMethod() {",
+      "code": "\tprivate String myMethod() {"
     },
     {
       "line": 10,
@@ -52,7 +52,7 @@
     },
     {
       "line": 12,
-      "code": "\t\t} else {",
+      "code": "\t\t} else {"
     },
     {
       "line": 13,
@@ -62,19 +62,19 @@
     },
     {
       "line": 14,
-      "code": "\t\t}",
+      "code": "\t\t}"
     },
     {
       "line": 15,
-      "code": "\t}",
+      "code": "\t}"
     },
     {
       "line": 16,
-      "code": "}",
+      "code": "}"
     },
     {
       "line": 17,
-      "code": "",
+      "code": ""
     }
   ]
 }