diff --git a/build.gradle b/build.gradle
index 3478c398..26005069 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,10 @@ buildscript {
 	}
 }
 
+plugins {
+	id "org.sonarqube" version "1.2"
+}
+
 group = 'org.springframework.session'
 
 ext.springBootVersion = '1.3.2.RELEASE'
@@ -27,12 +31,11 @@ ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
 ext.milestoneBuild = !(releaseBuild || snapshotBuild)
 
-apply plugin: 'sonar-runner'
 apply plugin: 'base'
 
 
-sonarRunner {
-	sonarProperties {
+sonarqube {
+	properties {
 		property "sonar.java.coveragePlugin", "jacoco"
 		property "sonar.projectName", "Spring Session"
 		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
diff --git a/samples/custom-cookie/build.gradle b/samples/custom-cookie/build.gradle
index 9fb8178e..6fe8e938 100644
--- a/samples/custom-cookie/build.gradle
+++ b/samples/custom-cookie/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/hazelcast-spring/build.gradle b/samples/hazelcast-spring/build.gradle
index 538d74dc..0ab048ca 100644
--- a/samples/hazelcast-spring/build.gradle
+++ b/samples/hazelcast-spring/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/hazelcast/build.gradle b/samples/hazelcast/build.gradle
index 6eca5f2f..9d9ed916 100644
--- a/samples/hazelcast/build.gradle
+++ b/samples/hazelcast/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-gemfire-clientserver-xml/build.gradle b/samples/httpsession-gemfire-clientserver-xml/build.gradle
index eeb388c6..94bca62f 100644
--- a/samples/httpsession-gemfire-clientserver-xml/build.gradle
+++ b/samples/httpsession-gemfire-clientserver-xml/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "application"
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-gemfire-clientserver/build.gradle b/samples/httpsession-gemfire-clientserver/build.gradle
index 14952fdb..eb7ac46e 100644
--- a/samples/httpsession-gemfire-clientserver/build.gradle
+++ b/samples/httpsession-gemfire-clientserver/build.gradle
@@ -4,7 +4,7 @@ apply plugin: "application"
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-gemfire-p2p-xml/build.gradle b/samples/httpsession-gemfire-p2p-xml/build.gradle
index 19f6a559..44455611 100644
--- a/samples/httpsession-gemfire-p2p-xml/build.gradle
+++ b/samples/httpsession-gemfire-p2p-xml/build.gradle
@@ -3,7 +3,7 @@ apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-gemfire-p2p/build.gradle b/samples/httpsession-gemfire-p2p/build.gradle
index 19f6a559..44455611 100644
--- a/samples/httpsession-gemfire-p2p/build.gradle
+++ b/samples/httpsession-gemfire-p2p/build.gradle
@@ -3,7 +3,7 @@ apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-jdbc-xml/build.gradle b/samples/httpsession-jdbc-xml/build.gradle
index 3eeef2de..d97d7809 100644
--- a/samples/httpsession-jdbc-xml/build.gradle
+++ b/samples/httpsession-jdbc-xml/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_6_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-jdbc/build.gradle b/samples/httpsession-jdbc/build.gradle
index dbe9fbf3..f7ec572b 100644
--- a/samples/httpsession-jdbc/build.gradle
+++ b/samples/httpsession-jdbc/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession-xml/build.gradle b/samples/httpsession-xml/build.gradle
index 680aa124..d9259f6e 100644
--- a/samples/httpsession-xml/build.gradle
+++ b/samples/httpsession-xml/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_6_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/httpsession/build.gradle b/samples/httpsession/build.gradle
index 9fb8178e..6fe8e938 100644
--- a/samples/httpsession/build.gradle
+++ b/samples/httpsession/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/rest/build.gradle b/samples/rest/build.gradle
index 736f5fdb..1947be84 100644
--- a/samples/rest/build.gradle
+++ b/samples/rest/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/security/build.gradle b/samples/security/build.gradle
index 524c6a62..fd9e9cb5 100644
--- a/samples/security/build.gradle
+++ b/samples/security/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }
 
diff --git a/samples/users/build.gradle b/samples/users/build.gradle
index 9fb8178e..6fe8e938 100644
--- a/samples/users/build.gradle
+++ b/samples/users/build.gradle
@@ -2,7 +2,7 @@ apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
+sonarqube {
 	skipProject = true
 }