From 0ecede028cef22850c82045a7aca00c0b836ccab Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Tue, 5 Jan 2016 17:16:39 +0100
Subject: [PATCH] Use the official SonarQube Gradle plugin

Since the build has been upgraded to Gradle 2.10, it's showing the
following message:
"The 'sonar-runner' plugin has been deprecated and is scheduled to be
removed in Gradle 3.0. please use the official plugin from SonarQube"

This commit makes use of the "org.sonarqube" Gradle plugin and uprgrades
the Jacoco agent version to 0.7.5.

See: https://sonar.spring.io/updatecenter/updates
See: https://jira.sonarsource.com/browse/SONARJAVA-1091

Closes gh-949
---
 build.gradle | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 72684478019..37d22c54f9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,10 @@ buildscript {
 	}
 }
 
+plugins {
+	id "org.sonarqube" version "1.1"
+}
+
 ext {
 	linkHomepage = 'https://projects.spring.io/spring-framework'
 	linkCi = 'https://build.spring.io/browse/SPR'
@@ -218,11 +222,11 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 	}
 
 	dependencies {
-		jacoco("org.jacoco:org.jacoco.agent:0.7.1.201405082137:runtime")
+		jacoco("org.jacoco:org.jacoco.agent:0.7.5.201505241946:runtime")
 	}
 
 	gradle.taskGraph.whenReady {taskGraph ->
-		if (taskGraph.hasTask(':sonarRunner')) {
+		if (taskGraph.hasTask(':sonarqube')) {
 			test.jvmArgs "-javaagent:${configurations.jacoco.asPath}=destfile=${buildDir}/jacoco.exec,includes=org.springframework.*"
 		}
 	}
@@ -1140,10 +1144,8 @@ project("spring-framework-bom") {
 	}
 }
 
-apply plugin: 'sonar-runner'
-
-sonarRunner {
-	sonarProperties {
+sonarqube {
+	properties {
 		property "sonar.projectName", "Spring Framework"
 		property "sonar.profile", "Spring Framework"
 		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
@@ -1399,14 +1401,14 @@ configure(rootProject) {
 }
 
 configure([project(':spring-build-src'), project(':spring-framework-bom')]) {
-	sonarRunner {
+	sonarqube {
 		skipProject = true
 	}
 }
 
 configure(project(':spring-core')) {
-	sonarRunner {
-		sonarProperties {
+	sonarqube {
+		properties {
 			property "sonar.exclusions",
 					"src/main/java/org/springframework/cglib/**/*,src/main/java/org/springframework/asm/**/*"
 		}