Upgrade sonar plugin and fix jacoco and new JS coverage location

Author: timyates

build.gradle

@@ -1,16 +1,7 @@
 plugins {
-    id "jacoco"
-    id "org.sonarqube" version "3.5.0.2730"
+    id "org.sonarqube" version "5.0.0.4638"
 }
 
-sonarqube {
-    properties {
-        property "sonar.sourceEncoding", "UTF-8"
-    }
-}
-
-tasks {
-    sonarqube {
-        dependsOn ":web-ui:yarn_run_coverage", ":server:jacocoTestReport"
-    }
+tasks.named("sonarqube") {
+    dependsOn ":web-ui:yarn_run_coverage", ":server:jacocoTestReport"
 }

server/build.gradle

@@ -126,7 +126,8 @@ test {
 jacocoTestReport {
     dependsOn test // tests are required to run before generating the report
     reports {
-        xml.required.set(true)
+        xml.required = true
+        csv.required = false
     }
 }
 
@@ -159,7 +160,8 @@ application {
 
 sonarqube {
     properties {
-        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml"
+        property "sonar.sourceEncoding", "UTF-8"
+        property "sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.file("reports/jacoco/test/jacocoTestReport.xml").get().asFile
         property "sonar.cpd.exclusions", "**/*DTO.java"
     }
 }

web-ui/build.gradle

@@ -69,10 +69,11 @@ sourceSets {
 
 sonarqube {
     properties {
+        property "sonar.sourceEncoding", "UTF-8"
         property "sonar.sources", "src/"
         property "sonar.exclusions", "**/*.stories.js,**/*.test.js,**/*.spec.js,**/*.stories.jsx,**/*.test.jsx,**/*.spec.jsx"
         property "sonar.coverage.exclusions", "**/*.stories.js,**/*.test.js,**/*.spec.js,**/*.stories.jsx,**/*.test.jsx,**/*.spec.jsx"
-        property "sonar.javascript.lcov.reportPaths", "coverage/lcov.info"
+        property "sonar.javascript.lcov.reportPaths", layout.projectDirectory.file("coverage/coverage-final.json").getAsFile()
     }
 }