diff --git a/.wrapper/gradle-wrapper.jar b/.wrapper/gradle-wrapper.jar
index 7073cdeb2b..aba4149786 100644
Binary files a/.wrapper/gradle-wrapper.jar and b/.wrapper/gradle-wrapper.jar differ
diff --git a/.wrapper/gradle-wrapper.properties b/.wrapper/gradle-wrapper.properties
index c25d7665be..43e747c047 100644
--- a/.wrapper/gradle-wrapper.properties
+++ b/.wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Dec 21 17:31:27 CET 2011
+#Thu Jan 12 12:49:02 CET 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-6-bin.zip
+distributionUrl=http\://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip
diff --git a/build.gradle b/build.gradle
index 375121c327..3e75dd7203 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,11 +5,11 @@ apply plugin: 'idea'
 
 buildscript {
     repositories {
-        maven { url 'https://repo.springsource.org/plugins-release' }
+        maven { url 'https://repo.springsource.org/plugins-snapshot' }
     }
     dependencies {
-        classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.1'
-        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.1'
+        classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2-SNAPSHOT'
+        classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.2-SNAPSHOT'
     }
 }
 
@@ -879,8 +879,11 @@ reference {
 task api(type: Javadoc) {
     group = 'Documentation'
     description = 'Generates aggregated Javadoc API documentation.'
-    options.overview = 'src/api/overview.html'
+    title = "${rootProject.description} ${version} API"
     options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+    options.author = true
+    options.header = rootProject.description
+    options.overview = 'src/api/overview.html'
     source subprojects.collect { project ->
         project.sourceSets.main.allJava
     }
@@ -967,7 +970,7 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
             from subproject.sourcesJar
             from subproject.javadocJar
         }
-   }
+    }
 }
 
 // Create an optional "with dependencies" distribution.
@@ -1013,7 +1016,8 @@ task dist(dependsOn: assemble) {
 
 task wrapper(type: Wrapper) {
     description = 'Generates gradlew[.bat] scripts'
-    gradleVersion = '1.0-milestone-6'
+    gradleVersion = '1.0-milestone-8'
+    distributionUrl = 'http://repo.gradle.org/gradle/distributions-snapshots/gradle-1.0-milestone-8-20120112000036+0100-bin.zip'
     jarFile = '.wrapper/gradle-wrapper.jar'
 }
 
diff --git a/gradlew b/gradlew
index 9826a9b555..b1fdaf1db4 100755
--- a/gradlew
+++ b/gradlew
@@ -105,10 +105,9 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     fi
 fi
 
-# For Darwin, add APP_NAME to the JAVA_OPTS as -Xdock:name
+# For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
-    JAVA_OPTS="$JAVA_OPTS -Xdock:name=$APP_NAME"
-# we may also want to set -Xdock:image
+    JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/src/api/doc-files/th-background.png b/src/api/doc-files/th-background.png
deleted file mode 100644
index 72d65e771f..0000000000
Binary files a/src/api/doc-files/th-background.png and /dev/null differ
diff --git a/src/api/spring-javadoc.css b/src/api/spring-javadoc.css
deleted file mode 100644
index c438fafa56..0000000000
--- a/src/api/spring-javadoc.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/* stylesheet.css 2008/04/22 nicolekonicki */
-
-/*
- *
- * Spring-specific Javadoc style sheet
- *
- */
-
-
-
-.code 
-{
-	border: 1px solid black;
-	background-color: #F4F4F4;
-	padding: 5px;
-}
-
-body 
-{
-	font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
-	background-color: #fff;
-	color: #333;
-}
-
-
-/* Link colors */
-a 
-{
-	color:#2c7b14;
-	text-decoration:none; 
-}
-
-a:hover 
-{
-	text-decoration:underline;
-}
-
-/* Headings */
-h1 
-{ 
-	font-size:28px;
-	color:#007c00; 
-}
-
-/* Table colors */
-
-table
-{
-	border:none;
-}
-
-td
-{
-	border:none;
-	border-bottom:1px dotted #ddd;
-}
-
-th
-{
-	border:none;
-}
-
-.TableHeadingColor th
-{
-	background-color: #efffcb;
-	background-image: url(doc-files/th-background.png);
-	background-repeat: repeat-x;
-	color:#fff;
-	font-size:14px;
-	height:26px;
-}
-
-.TableSubHeadingColor  
-{ 
-	background: #f7ffee;
-
-} 
-.TableRowColor         
-{ 
-	background: #fff;
-}
-
-.TableRowColor a      
-{ 
-	border-bottom:none;
-	color:#2c7b14;
-	font-weight:normal;
-}
-
-tr.TableRowColor:hover
-{
-	background:#eef2e1;
-}
-
- 
-/* Font used in left-hand frame lists */
-.FrameTitleFont   
-{ 
-	font-size: 120%; 
-	font-weight:bold;
-}
-
-.FrameTitleFont a   
-{  
-	color: #333;
-}
-
-.FrameHeadingFont 
-{ 
-	font-weight: bold;
-	font-size:95%;
-}
-
-.FrameItemFont    
-{ 
-	line-height:130%;
-	font-size: 95%; 
-}
-
-.FrameItemFont a
-{
-	color:#333;
-}
-
-.FrameItemFont a:hover
-{
-	color:#249901;
-	border-bottom:none;
-	text-decoration:underline;
-}
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    
-{ 
-	background-color:#fff;
-	border:none;
-} 
-
-.NavBarCell1Rev 
-{ 
-	background-color:#e3faa5;
-	border:1px solid #9ad00c;
-	padding:0;
-	margin:0;
-} 
-
-.NavBarCell1 a  
-{ 
-	color:#333;
-	text-decoration:none;
-}
-
-.NavBarFont1Rev 
-{ 
-
-}
-
-.NavBarCell2
-{
-	border:none;
-}
-
-.NavBarCell2 a    
-{ 
-	color:#249901;
-	font-size:90%;
-}
-
-.NavBarCell3    
-{ 
-	border:none;
-}
-
-/* Override sizes in font tags */
-font
-{
-	font: inherit !important;
-}