Improve Sonar and Jacoco plugin configurations

Author: artembilan

build.gradle

@@ -238,6 +238,19 @@ subprojects { subproject ->
 		jacoco {
 			destinationFile = file("$buildDir/jacoco.exec")
 		}
+
+		if (System.properties['sonar.host.url']) {
+			finalizedBy jacocoTestReport
+		}
+	}
+
+	jacocoTestReport {
+		reports {
+			xml.enabled true
+			csv.enabled false
+			html.enabled false
+			xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
+		}
 	}
 
 	task testAll(type: Test, dependsOn: check)
@@ -285,7 +298,6 @@ subprojects { subproject ->
 	}
 
 	check.dependsOn javadoc
-	build.dependsOn jacocoTestReport
 
 }
 
@@ -477,13 +489,11 @@ task reference(dependsOn: asciidoctor) {
 
 sonarqube {
 	properties {
-		property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec"
 		property 'sonar.links.homepage', linkHomepage
 		property 'sonar.links.ci', linkCi
 		property 'sonar.links.issue', linkIssue
 		property 'sonar.links.scm', linkScmUrl
 		property 'sonar.links.scm_dev', linkScmDevConnection
-		property 'sonar.java.coveragePlugin', 'jacoco'
 	}
 }