diff --git a/docs/build.gradle b/docs/build.gradle
index eb7e256b..6273f70b 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -19,7 +19,7 @@ apply from: "$rootDir/gradle/docbook.gradle"
 
 
 task build(dependsOn: assemble) {
-    taskGroup = 'Build'
+    group = 'Build'
     description = 'Builds reference and API documentation and archives'
 }
 
@@ -34,7 +34,7 @@ task build(dependsOn: assemble) {
  * @see http://gradle.org/0.9-preview-3/docs/javadoc/org/gradle/api/tasks/javadoc/Javadoc.html
  */
  task api(type: Javadoc) {
-    taskGroup = 'Documentation'
+    group = 'Documentation'
     description = "Builds aggregated JavaDoc HTML for all core project classes."
 
     // this task is a bit ugly to configure. it was a user contribution, and
@@ -111,7 +111,7 @@ task preprocessDocbookSources {
 // 'docbook' plugin.
 // -----------------------------------------------------------------------------
 task reference(dependsOn: [docbookHtml, docbookHtmlSingle, docbookPdf]) {
-    taskGroup = 'Documentation'
+    group = 'Documentation'
     description = 'Generates all HTML and PDF reference documentation.'
 }
 
@@ -155,7 +155,7 @@ docsSpec = copySpec {
 }
 
 task archive(type: Zip, dependsOn: [api, reference]) {
-    taskGroup = "Documentation"
+    group = "Documentation"
     description = "Create a zip archive of reference and API documentation."
 
     baseName = rootProject.name + '-docs'
@@ -185,12 +185,11 @@ uploadArchives {
     def remoteDocsDir = "${remoteSiteDir}/docs/${version.wildcardValue}"
     def fqRemoteDir = "${sshUsername}@${sshHost}:${remoteDocsDir}"
 
+    group = 'Buildmaster'
     description = "Uploads and unpacks documentation archive" + (sshHost ? " to ${docUrl}" : ": Host is not specified")
 
     uploadDescriptor = false
 
-    taskGroup = 'Buildmaster'
-
     repositories {
         add(new org.apache.ivy.plugins.resolver.SshResolver()) {
             name = 'sshHost: ' + sshHost // used for debugging
diff --git a/gradle/checks.gradle b/gradle/checks.gradle
index 5e803f9f..22401112 100644
--- a/gradle/checks.gradle
+++ b/gradle/checks.gradle
@@ -70,8 +70,8 @@ task snapshotDependencyReport {
  * @see snapshotDependencyReport
  */
 task snapshotDependencyCheck(dependsOn: snapshotDependencyReport) {
+    group = 'Verification'
     description = 'Aborts the build if any Java project has snapshot dependencies.'
-    taskGroup = 'verification'
 
     // bind to build lifecycle if we're a non-snapshot release
     if (version.releaseType != 'SNAPSHOT') {
diff --git a/gradle/dist.gradle b/gradle/dist.gradle
index 2f5321de..0a759746 100644
--- a/gradle/dist.gradle
+++ b/gradle/dist.gradle
@@ -28,11 +28,11 @@ project.subprojects.each { project ->
 }
 
 task check {
-    taskGroup = 'Verification'
+    group = 'Verification'
 }
 
 task build(dependsOn: [check, assemble]) {
-    taskGroup = 'Build'
+    group = 'Build'
 }
 
 /**
@@ -41,7 +41,7 @@ task build(dependsOn: [check, assemble]) {
  * @author cbeams
  */
 task distArchive(type: Zip) {
-    taskGroup = 'Build'
+    group = 'Build'
 
     destinationDir = buildDir
     archiveName = "${project.name}-${project.version}.zip"
@@ -98,6 +98,7 @@ task distArchive(type: Zip) {
  * @author cbeams
  */
 task uploadArchives(overwrite: true, dependsOn: distArchive) { // base plugin adds one we need to overwrite
+    group = 'Buildmaster'
     description = 'Uploads the distribution zip file.'
 
     configurations { antlibs }
@@ -108,8 +109,6 @@ task uploadArchives(overwrite: true, dependsOn: distArchive) { // base plugin ad
 
     def releaseType = version.releaseType.toString().toLowerCase()
 
-    taskGroup = 'buildmaster'
-
     doLast() {
         println "Uploading: ${distArchive.archivePath} to s3"
         project.ant {
diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle
index 815097a8..7f92b886 100644
--- a/gradle/maven-deployment.gradle
+++ b/gradle/maven-deployment.gradle
@@ -69,7 +69,7 @@ artifacts {
  * @see http://maven.apache.org/guides/mini/guide-central-repository-upload.html
  */
 uploadArchives {
-    taskGroup = 'Buildmaster'
+    group = 'Buildmaster'
     description = "Does a maven deploy of archives artifacts to " // url appended below
 
     def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}"
diff --git a/gradle/wrapper.gradle b/gradle/wrapper.gradle
index b21b6db8..e7bb303b 100644
--- a/gradle/wrapper.gradle
+++ b/gradle/wrapper.gradle
@@ -23,10 +23,10 @@
  * @see http://gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#gradle_wrapper
  */
 task wrapper(type: Wrapper) {
+    group = 'Buildmaster'
     description = "Generates gradlew and gradlew.bat bootstrap scripts"
     gradleVersion = '0.9-preview-3'
     // place jar file and properties into a
     // subdirectory to avoid root dir clutter
     jarPath = 'gradle/wrapper'
-    taskGroup = 'buildmaster'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2973ccd..98844070 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
-#Fri Jul 09 15:17:22 CEST 2010
+#Thu Jul 29 11:20:13 CEST 2010
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-distributionVersion=0.9-20100726131918+0200
+distributionVersion=0.9-20100728180850+0200
 zipStorePath=wrapper/dists
 urlRoot=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-snapshots
 distributionName=gradle
diff --git a/settings.gradle b/settings.gradle
index 3014851a..8998cddd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,9 +19,7 @@
  *
  * @see http://www.gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#javaMultiProject
  */
-include 'docs:api',
-        'docs:reference',
-        'docs:txt',
+include 'docs',
         'spring-amqp-core',
         'spring-erlang',
         'spring-rabbit',