Improve Sonar and Jacoco plugin configurations

Author: artembilan

build.gradle

@@ -187,6 +187,10 @@ subprojects { subproject ->
 			destinationFile = file("$buildDir/jacoco.exec")
 		}
 		useJUnitPlatform()
+
+		if (System.properties['sonar.host.url']) {
+			finalizedBy jacocoTestReport
+		}
 	}
 
 	checkstyle {
@@ -196,14 +200,13 @@ subprojects { subproject ->
 
 	jacocoTestReport {
 		reports {
-			xml.enabled false
+			xml.enabled true
 			csv.enabled false
-			html.destination file("${buildDir}/reports/jacoco/html")
+			html.enabled false
+			xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
 		}
 	}
 
-	build.dependsOn jacocoTestReport
-
 	publishing {
 		publications {
 			mavenJava(MavenPublication) {
@@ -339,6 +342,16 @@ project ('spring-kafka-test') {
 	}
 }
 
+sonarqube {
+	properties {
+		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
+	}
+}
+
 configurations {
 	docs
 }
@@ -417,18 +430,6 @@ task reference(dependsOn: asciidoctor) {
 
 reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasProperty('ignoreEnvToStopReference') }
 
-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'
-	}
-}
-
 task api(type: Javadoc) {
 	group = 'Documentation'
 	description = 'Generates aggregated Javadoc API documentation.'