diff --git a/build.gradle b/build.gradle
index f0ae0ef..8532e0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,15 @@ repositories {
 sourceCompatibility=1.6
 targetCompatibility=1.6
 
+ext {
+	linkHomepage = 'https://github.com/SpringSource/spring-integration-extensions'
+	linkCi       = 'https://build.springsource.org/browse/INTEXT'
+	linkIssue    = 'https://jira.springsource.org/browse/INTEXT'
+	linkScmUrl           = 'https://github.com/SpringSource/spring-integration-extensions'
+	linkScmConnection    = 'https://github.com/SpringSource/spring-integration-extensions.git'
+	linkScmDevConnection = 'git@github.com:SpringSource/spring-integration-extensions.git'
+}
+
 // See http://www.gradle.org/docs/current/userguide/dependency_management.html#sub:configurations
 // and http://www.gradle.org/docs/current/dsl/org.gradle.api.artifacts.ConfigurationContainer.html
 configurations {
@@ -96,38 +105,17 @@ reference {
 	sourceDir = file('src/reference/docbook')
 }
 
-apply plugin: 'sonar'
+apply plugin: 'sonar-runner'
 
-sonar {
-
-	if (rootProject.hasProperty('sonarHostUrl')) {
-		server.url = rootProject.sonarHostUrl
+sonarRunner {
+	sonarProperties {
+		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
 	}
-
-	database {
-		if (rootProject.hasProperty('sonarJdbcUrl')) {
-			url = rootProject.sonarJdbcUrl
-		}
-		if (rootProject.hasProperty('sonarJdbcDriver')) {
-			driverClassName = rootProject.sonarJdbcDriver
-		}
-		if (rootProject.hasProperty('sonarJdbcUsername')) {
-			username = rootProject.sonarJdbcUsername
-		}
-		if (rootProject.hasProperty('sonarJdbcPassword')) {
-			password = rootProject.sonarJdbcPassword
-		}
-	}
-
-	project {
-		dynamicAnalysis  = "reuseReports"
-		withProjectProperties { props ->
-			props["sonar.core.codeCoveragePlugin"] = "jacoco"
-			props["sonar.jacoco.reportPath"]       = "${buildDir.name}/jacoco.exec"
-		}
-	}
-
-	logger.info("Sonar parameters used: server.url='${server.url}'; database.url='${database.url}'; database.driverClassName='${database.driverClassName}'; database.username='${database.username}'")
 }
 
 task api(type: Javadoc) {
@@ -270,7 +258,7 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.2'
+	gradleVersion = '1.6'
 }
 
 defaultTasks 'build'
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e3b3376..a7634b0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5f2266e..ba108aa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 28 09:33:09 CST 2012
+#Wed May 15 23:11:13 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/gradlew b/gradlew
index cf12650..91a7e26 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ##############################################################################
 ##
@@ -61,9 +61,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/"
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED"
+cd "$SAVED" >&-
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -101,7 +101,7 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
             warn "Could not set maximum file descriptor limit: $MAX_FD"
         fi
     else
-        warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
     fi
 fi