From 77da949c1625dfbec72a01e83d287c7773c7cc75 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 5 Jul 2011 21:32:49 +0300
Subject: [PATCH] + gradle updates

---
 build.gradle                 | 10 ++--------
 docs/src/api/javadoc.options |  4 +---
 maven.gradle                 |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 21cc7d608..fdd046037 100644
--- a/build.gradle
+++ b/build.gradle
@@ -104,15 +104,7 @@ javaprojects = rootProject
 sourceCompatibility = 1.6
 targetCompatibility = 1.6 
 
-apply from: "$rootDir/maven.gradle"
-
 javadoc {
-  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
-  // Hans tells me it's on the roadmap to redesign it.
-  
   srcDir = file("${projectDir}/docs/src/api")
   destinationDir = file("${buildDir}/api")
   tmpDir = file("${buildDir}/api-work")
@@ -208,5 +200,7 @@ task uploadDist(type: org.springframework.gradle.tasks.S3DistroUpload, dependsOn
     projectName = 'Spring Data Key Value'
 }
 
+apply from: "$rootDir/maven.gradle"
+
 assemble.dependsOn = ['jar', 'sourceJar', 'javadocJar']
 defaultTasks 'clean', 'build'
\ No newline at end of file
diff --git a/docs/src/api/javadoc.options b/docs/src/api/javadoc.options
index 432e5b85e..afd44d909 100644
--- a/docs/src/api/javadoc.options
+++ b/docs/src/api/javadoc.options
@@ -1,12 +1,10 @@
 -breakiterator 
--header "Spring Data Key-Value"
+-header "Spring Data Redis"
 -source 1.6
 -protected
 -quiet
 -docfilessubdirs
--group "Spring Data Key Value Core" "org.springframework.data.keyvalue*"
 -group "Spring Data Redis Support" "org.springframework.data.redis*"
--group "Spring Data Riak Support" "org.springframework.data.keyvalue.riak*"
 -link http://static.springframework.org/spring/docs/3.0.x/javadoc-api
 -link http://download.oracle.com/javase/6/docs/api/
 -exclude org.springframework.data.redis.config
diff --git a/maven.gradle b/maven.gradle
index d381aa2fe..a791a987d 100644
--- a/maven.gradle
+++ b/maven.gradle
@@ -7,9 +7,9 @@ task sourceJar(type: Jar, dependsOn: jar) {
 }
 
 // Create a javadoc jar for uploading
-task javadocJar(type: Jar, dependsOn: rootProject.javadoc) {
+task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
-    from rootProject.javadoc.destinationDir
+    from javadoc.destinationDir
 }
 
 artifacts {