diff --git a/bom/build.gradle b/bom/build.gradle
index 3f1d9b5875..a5bc2668fa 100644
--- a/bom/build.gradle
+++ b/bom/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'maven-bom'
 apply from: "$rootDir/gradle/maven-deployment.gradle"
 
 generatePom.enabled = false
-sonarRunner.skipProject = true
+sonarqube.skipProject = true
 
 mavenBom {
 	projects = coreModuleProjects
diff --git a/build.gradle b/build.gradle
index c66137bd8e..22fc40c619 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,10 @@ buildscript {
 	}
 }
 
-apply plugin: 'sonar-runner'
+plugins {
+	id "org.sonarqube" version "1.2"
+}
+
 apply plugin: 'base'
 
 description = 'Spring Security'
@@ -40,8 +43,8 @@ allprojects {
 	eclipse.project.name = "${project.name}-4.1.x"
 }
 
-sonarRunner {
-	sonarProperties {
+sonarqube {
+	properties {
 		property "sonar.java.coveragePlugin", "jacoco"
 		property "sonar.projectName", "Spring Security"
 		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
@@ -82,7 +85,7 @@ configure(allprojects - javaProjects) {
 
 configure(subprojects - coreModuleProjects - project(':spring-security-samples-messages-jc') - project(':spring-security-bom')) {
 	tasks.findByPath("artifactoryPublish")?.enabled = false
-	sonarRunner {
+	sonarqube {
 		skipProject = true
 	}
 }
diff --git a/gradle/war-sample.gradle b/gradle/war-sample.gradle
index 8decfb919b..5250d0bd3b 100644
--- a/gradle/war-sample.gradle
+++ b/gradle/war-sample.gradle
@@ -5,6 +5,6 @@ war {
 	baseName = "sample"
 }
 
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
\ No newline at end of file
diff --git a/samples/messages-jc/build.gradle b/samples/messages-jc/build.gradle
index b565eee840..cf64c78849 100644
--- a/samples/messages-jc/build.gradle
+++ b/samples/messages-jc/build.gradle
@@ -1,4 +1,4 @@
-sonarRunner.skipProject = true
+sonarqube.skipProject = true
 
 dependencies {
 	provided "javax.servlet:javax.servlet-api:3.0.1"