From 342f8e87731d0f96badef789c4ad02116c3fd002 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Fri, 28 Aug 2020 12:45:40 -0400
Subject: [PATCH] Revert to Sonar plugin 2.8 to show coverage

---
 build.gradle | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index e7a142be36..6677f51c1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 plugins {
-	id 'org.sonarqube' version '3.0'
+	id 'org.sonarqube' version '2.8'
 	id 'io.spring.nohttp' version '0.0.5.RELEASE' apply false
 	id 'org.ajoberstar.grgit' version '4.0.2'
 	id "io.spring.dependency-management" version '1.0.9.RELEASE'
@@ -289,18 +289,16 @@ configure(javaProjects) { subproject ->
 	compileKotlin.dependsOn updateCopyrights
 
 	jacocoTestReport {
+		dependsOn test
 		reports {
 			xml.enabled false
 			csv.enabled false
-			html.destination file("${buildDir}/reports/jacoco/html")
+			html.destination file("$buildDir/reports/jacoco/html")
 		}
 	}
 
 	test {
 		maxHeapSize = '1536m'
-		jacoco {
-			destinationFile = file("$buildDir/jacoco.exec")
-		}
 	}
 
 	task testAll(type: Test, dependsOn: [':checkAsciidocLinks', 'check'])
@@ -909,6 +907,10 @@ project('spring-integration-bom') {
 			}
 		}
 	}
+
+	sonarqube {
+		skipProject = true
+	}
 }
 
 configurations {
@@ -1033,7 +1035,6 @@ reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasPrope
 
 sonarqube {
 	properties {
-		property 'sonar.coverage.jacoco.xmlReportPaths', "${buildDir.name}/jacoco.exec"
 		property 'sonar.links.homepage', linkHomepage
 		property 'sonar.links.ci', linkCi
 		property 'sonar.links.issue', linkIssue