diff --git a/spring-integration-aws/build.gradle b/spring-integration-aws/build.gradle
index 2656d3f..65e6200 100644
--- a/spring-integration-aws/build.gradle
+++ b/spring-integration-aws/build.gradle
@@ -42,6 +42,12 @@ ext {
 
 	idPrefix = 'aws'
 
+	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'
 }
 
 ext.javadocLinks = [
@@ -137,39 +143,17 @@ artifacts {
 	archives javadocJar
 }
 
-apply plugin: 'sonar'
-apply plugin: 'sonar-runner' //New for Gradle 1.5
+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 schemaZip(type: Zip) {
@@ -285,5 +269,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5-rc-1'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-aws/gradle/wrapper/gradle-wrapper.jar b/spring-integration-aws/gradle/wrapper/gradle-wrapper.jar
index 42d9b0e..a7634b0 100644
Binary files a/spring-integration-aws/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-aws/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-aws/gradle/wrapper/gradle-wrapper.properties b/spring-integration-aws/gradle/wrapper/gradle-wrapper.properties
index 46ef152..af6eef4 100644
--- a/spring-integration-aws/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-aws/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 11 17:28:12 EDT 2013
+#Wed May 15 22:09:50 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-rc-1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/spring-integration-ip-extensions/build.gradle b/spring-integration-ip-extensions/build.gradle
index 9b87052..d6d8aa8 100644
--- a/spring-integration-ip-extensions/build.gradle
+++ b/spring-integration-ip-extensions/build.gradle
@@ -34,6 +34,13 @@ ext {
 	mockitoVersion = '1.9.0'
 	springVersion = '3.1.3.RELEASE'
 	springIntegrationVersion = '3.0.0.M1'
+	
+	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'
 }
 
 eclipse {
@@ -92,38 +99,17 @@ artifacts {
 	archives javadocJar
 }
 
-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) {
@@ -219,5 +205,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.3'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.jar b/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.jar
index 7b359d7..a7634b0 100644
Binary files a/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.properties b/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.properties
index b2ebed1..75a9372 100644
--- a/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-ip-extensions/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jan 07 15:58:18 EST 2013
+#Wed May 15 22:10:16 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/spring-integration-ip-extensions/gradlew b/spring-integration-ip-extensions/gradlew
index 3851082..91a7e26 100755
--- a/spring-integration-ip-extensions/gradlew
+++ b/spring-integration-ip-extensions/gradlew
@@ -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
 
diff --git a/spring-integration-mqtt/build.gradle b/spring-integration-mqtt/build.gradle
index 313d539..1c429ad 100644
--- a/spring-integration-mqtt/build.gradle
+++ b/spring-integration-mqtt/build.gradle
@@ -11,7 +11,7 @@ apply from:   "${rootProject.projectDir}/publish-maven.gradle"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-group = 'org.springframework.integration.mqtt'
+group = 'org.springframework.integration'
 
 repositories {
 	maven { url 'http://repo.springsource.org/libs-snapshot' }
@@ -30,6 +30,13 @@ ext {
 	springIntegrationVersion = '3.0.0.BUILD-SNAPSHOT'
 
 	idPrefix = 'mqttadapter'
+	
+	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'
 }
 
 eclipse {
@@ -89,38 +96,17 @@ artifacts {
 	archives javadocJar
 }
 
-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) {
diff --git a/spring-integration-print/build.gradle b/spring-integration-print/build.gradle
index 46ed9a1..97c70c4 100644
--- a/spring-integration-print/build.gradle
+++ b/spring-integration-print/build.gradle
@@ -11,7 +11,7 @@ apply from:   "${rootProject.projectDir}/publish-maven.gradle"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
-group = 'org.springframework.integration.print'
+group = 'org.springframework.integration'
 
 repositories {
 	maven { url 'http://repo.springsource.org/libs-milestone' }
@@ -28,6 +28,13 @@ ext {
 	mockitoVersion = '1.9.0'
 	springVersion = '3.1.3.RELEASE'
 	springIntegrationVersion = '2.2.0.RC2'
+	
+	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'
 }
 
 eclipse {
@@ -89,38 +96,17 @@ artifacts {
 	archives javadocJar
 }
 
-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) {
@@ -252,5 +238,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.2'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-print/gradle/wrapper/gradle-wrapper.jar b/spring-integration-print/gradle/wrapper/gradle-wrapper.jar
index 7b359d7..a7634b0 100644
Binary files a/spring-integration-print/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-print/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-print/gradle/wrapper/gradle-wrapper.properties b/spring-integration-print/gradle/wrapper/gradle-wrapper.properties
index d856b21..490fcad 100644
--- a/spring-integration-print/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-print/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Nov 08 09:58:34 EST 2012
+#Wed May 15 22:11:45 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/spring-integration-print/gradlew b/spring-integration-print/gradlew
index 3851082..91a7e26 100755
--- a/spring-integration-print/gradlew
+++ b/spring-integration-print/gradlew
@@ -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
 
diff --git a/spring-integration-smb/build.gradle b/spring-integration-smb/build.gradle
index c121430..62aca20 100644
--- a/spring-integration-smb/build.gradle
+++ b/spring-integration-smb/build.gradle
@@ -40,6 +40,13 @@ ext {
 	springIntegrationVersion = '2.2.1.RELEASE'
 
 	idPrefix = 'smb'
+	
+	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'
 
 }
 
@@ -118,38 +125,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) {
@@ -282,5 +268,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.4'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar
index b6b646b..a7634b0 100644
Binary files a/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-smb/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties
index 589a827..426d227 100644
--- a/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-smb/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Feb 22 11:59:38 EST 2013
+#Wed May 15 22:13:48 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.4-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/spring-integration-smpp/build.gradle b/spring-integration-smpp/build.gradle
index 7b127e7..c542169 100644
--- a/spring-integration-smpp/build.gradle
+++ b/spring-integration-smpp/build.gradle
@@ -37,6 +37,13 @@ ext {
 	springIntegrationVersion = '2.2.0.RELEASE'
 
 	idPrefix = 'smpp'
+	
+	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'
 }
 
 eclipse {
@@ -106,38 +113,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) {
@@ -269,5 +255,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.3'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-smpp/gradle/wrapper/gradle-wrapper.jar b/spring-integration-smpp/gradle/wrapper/gradle-wrapper.jar
index 7b359d7..a7634b0 100644
Binary files a/spring-integration-smpp/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-smpp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-smpp/gradle/wrapper/gradle-wrapper.properties b/spring-integration-smpp/gradle/wrapper/gradle-wrapper.properties
index 6ebbb7b..474fe6f 100644
--- a/spring-integration-smpp/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-smpp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 08 17:13:07 EST 2013
+#Wed May 15 22:15:12 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/spring-integration-smpp/gradlew b/spring-integration-smpp/gradlew
index 3851082..91a7e26 100755
--- a/spring-integration-smpp/gradlew
+++ b/spring-integration-smpp/gradlew
@@ -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
 
diff --git a/spring-integration-splunk/build.gradle b/spring-integration-splunk/build.gradle
index f0ae0ef..8532e0c 100644
--- a/spring-integration-splunk/build.gradle
+++ b/spring-integration-splunk/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/spring-integration-splunk/gradle/wrapper/gradle-wrapper.jar b/spring-integration-splunk/gradle/wrapper/gradle-wrapper.jar
index e3b3376..a7634b0 100644
Binary files a/spring-integration-splunk/gradle/wrapper/gradle-wrapper.jar and b/spring-integration-splunk/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/spring-integration-splunk/gradle/wrapper/gradle-wrapper.properties b/spring-integration-splunk/gradle/wrapper/gradle-wrapper.properties
index 5f2266e..ba108aa 100644
--- a/spring-integration-splunk/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-splunk/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/spring-integration-splunk/gradlew b/spring-integration-splunk/gradlew
index cf12650..91a7e26 100755
--- a/spring-integration-splunk/gradlew
+++ b/spring-integration-splunk/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
 
diff --git a/spring-integration-voldemort/build.gradle b/spring-integration-voldemort/build.gradle
index adc7080..6cc7da4 100755
--- a/spring-integration-voldemort/build.gradle
+++ b/spring-integration-voldemort/build.gradle
@@ -33,6 +33,14 @@ ext {
 	voldemortVersion = '0.96'
 
 	shortName = 'voldemort'
+
+	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'
+
 }
 
 eclipse {
@@ -99,39 +107,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) {
@@ -263,5 +249,5 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
 	description = 'Generates gradlew[.bat] scripts'
-	gradleVersion = '1.5'
+	gradleVersion = '1.6'
 }
diff --git a/spring-integration-voldemort/gradle/wrapper/gradle-wrapper.properties b/spring-integration-voldemort/gradle/wrapper/gradle-wrapper.properties
index 8f67036..24bbb2c 100755
--- a/spring-integration-voldemort/gradle/wrapper/gradle-wrapper.properties
+++ b/spring-integration-voldemort/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 02 00:18:40 EDT 2013
+#Wed May 15 17:51:22 EDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
diff --git a/spring-integration-voldemort/publish-maven.gradle b/spring-integration-voldemort/publish-maven.gradle
index 0ba656a..2083c33 100755
--- a/spring-integration-voldemort/publish-maven.gradle
+++ b/spring-integration-voldemort/publish-maven.gradle
@@ -31,7 +31,7 @@ def customizePom(pom, gradleProject) {
 		generatedPom.project {
 			name = gradleProject.description
 			description = gradleProject.description
-			url = 'https://github.com/SpringSource/spring-integration-extensions'
+			url = linkHomepage
 			organization {
 				name = 'SpringSource'
 				url = 'http://springsource.org'
@@ -44,9 +44,9 @@ def customizePom(pom, gradleProject) {
 				}
 			}
 			scm {
-				url = 'https://github.com/SpringSource/spring-integration-extensions'
-				connection = 'scm:git:git://github.com/SpringSource/spring-integration-extensions'
-				developerConnection = 'scm:git:git://github.com/SpringSource/spring-integration-extensions'
+				url = linkScmUrl
+				connection = linkScmConnection
+				developerConnection = linkScmDevConnection
 			}
 
 			developers {