From 6e023f5df050ef65178dbc827b2863b1556fc742 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Fri, 1 Jul 2011 19:32:02 +0300
Subject: [PATCH] + upgrade gradle files

---
 build.gradle                                  |  9 ++++++---
 maven.gradle                                  |  1 +
 spring-data-redis/.classpath                  |  6 +++---
 spring-data-redis/.project                    | 19 +++++++++----------
 .../.settings/org.eclipse.jdt.core.prefs      |  2 +-
 spring-data-redis/gradle.properties           |  4 ++--
 6 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index 02537df8e..b29381dbf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,8 +56,8 @@ javaprojects = subprojects.findAll {
 }
 
 configure(javaprojects) {
-	apply plugin: "java"
-	apply plugin: "maven"
+  apply plugin: "java"
+  apply plugin: "maven"
   apply plugin: 'eclipse'  // `gradle eclipse` to generate .classpath/.project
   apply plugin: 'idea'     // `gradle idea` to generate .ipr/.iml
   apply plugin: 'docbook'
@@ -100,10 +100,12 @@ ideaProject {
 
 task wrapper(type: Wrapper) {
     gradleVersion = '0.9.2'
+    description = "Generate the Gradle wrapper"
+    group = "Distribution"
 }
 
 // Distribution tasks
-task dist(type: Zip) {
+task dist(type: Zip, group: "Distribute") {
     dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' }
 
     evaluationDependsOn(':docs')
@@ -129,6 +131,7 @@ task dist(type: Zip) {
 
 task uploadDist(type: org.springframework.gradle.tasks.S3DistroUpload) {
     description = "Upload Zip Distribution"
+    group = "Distribution"
     archiveFile = dist.archivePath
     projectKey = 'DATAKV'
     projectName = 'Spring Data Key Value'
diff --git a/maven.gradle b/maven.gradle
index 922b47738..8b3c2465b 100644
--- a/maven.gradle
+++ b/maven.gradle
@@ -37,6 +37,7 @@ def deployer = null
 
 uploadArchives {
     description = "Maven deploy of archives artifacts to SpringSource Maven repos" // url appended below
+    group = "Distribution"
     // Maven deployment
     def releaseRepositoryUrl = "file://${project.properties.mavenSyncRepoDir}"
     def milestoneRepositoryUrl = 's3://maven.springframework.org/milestone'
diff --git a/spring-data-redis/.classpath b/spring-data-redis/.classpath
index 67688ee1b..3848cd547 100644
--- a/spring-data-redis/.classpath
+++ b/spring-data-redis/.classpath
@@ -5,7 +5,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="src" path="/spring-data-core"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.slf4j/slf4j-log4j12/jars/slf4j-log4j12-1.6.1.jar" sourcepath="C:/Users/costin/.gradle/cache/org.slf4j/slf4j-log4j12/sources/slf4j-log4j12-1.6.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-context-support/jars/spring-context-support-3.0.5.RELEASE.jar" sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-context-support/sources/spring-context-support-3.0.5.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-expression/jars/spring-expression-3.0.5.RELEASE.jar" sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-expression/sources/spring-expression-3.0.5.RELEASE-sources.jar"/>
@@ -25,14 +24,15 @@
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-tx/jars/spring-tx-3.0.5.RELEASE.jar" sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-tx/sources/spring-tx-3.0.5.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-test/jars/spring-test-3.0.5.RELEASE.jar" sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-test/sources/spring-test-3.0.5.RELEASE-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.springframework/spring-aop/jars/spring-aop-3.0.5.RELEASE.jar" sourcepath="C:/Users/costin/.gradle/cache/org.springframework/spring-aop/sources/spring-aop-3.0.5.RELEASE-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/redis.clients/jedis/jars/jedis-2.0.0.jar" sourcepath="C:/Users/costin/.gradle/cache/redis.clients/jedis/sources/jedis-2.0.0-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/commons-pool/commons-pool/jars/commons-pool-1.5.6.jar" sourcepath="C:/Users/costin/.gradle/cache/commons-pool/commons-pool/sources/commons-pool-1.5.6-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/javax.annotation/jsr250-api/jars/jsr250-api-1.0.jar" sourcepath="C:/Users/costin/.gradle/cache/javax.annotation/jsr250-api/sources/jsr250-api-1.0-sources.jar"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/spring-data-keyvalue-core"/>
+	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/commons-beanutils/commons-beanutils-core/jars/commons-beanutils-core-1.8.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/com.thoughtworks.xstream/xstream/jars/xstream-1.3.jar" sourcepath="C:/Users/costin/.gradle/cache/com.thoughtworks.xstream/xstream/sources/xstream-1.3-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/redis.clients/jedis/jars/jedis-1.5.2.jar" sourcepath="C:/Users/costin/.gradle/cache/redis.clients/jedis/sources/jedis-1.5.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.mockito/mockito-all/jars/mockito-all-1.8.5.jar" sourcepath="C:/Users/costin/.gradle/cache/org.mockito/mockito-all/sources/mockito-all-1.8.5-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/junit/junit/jars/junit-4.8.1.jar" sourcepath="C:/Users/costin/.gradle/cache/junit/junit/sources/junit-4.8.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/org.slf4j/jcl-over-slf4j/jars/jcl-over-slf4j-1.6.1.jar" sourcepath="C:/Users/costin/.gradle/cache/org.slf4j/jcl-over-slf4j/sources/jcl-over-slf4j-1.6.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="C:/Users/costin/.gradle/cache/commons-logging/commons-logging/jars/commons-logging-1.1.1.jar" sourcepath="C:/Users/costin/.gradle/cache/commons-logging/commons-logging/sources/commons-logging-1.1.1-sources.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/spring-data-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/spring-data-redis/.project b/spring-data-redis/.project
index 05a85bfd6..7ab2483ad 100644
--- a/spring-data-redis/.project
+++ b/spring-data-redis/.project
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>spring-data-redis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
+	<comment/>
+	<projects/>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments/>
+		</buildCommand>
+	</buildSpec>
+	<links/>
 </projectDescription>
diff --git a/spring-data-redis/.settings/org.eclipse.jdt.core.prefs b/spring-data-redis/.settings/org.eclipse.jdt.core.prefs
index fd101f89f..9811d21e9 100644
--- a/spring-data-redis/.settings/org.eclipse.jdt.core.prefs
+++ b/spring-data-redis/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Thu Apr 21 21:26:50 EEST 2011
+#Fri Jul 01 15:44:20 EEST 2011
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff --git a/spring-data-redis/gradle.properties b/spring-data-redis/gradle.properties
index 30f296975..74a43fc38 100644
--- a/spring-data-redis/gradle.properties
+++ b/spring-data-redis/gradle.properties
@@ -1,5 +1,5 @@
 # Dependencies properties
-jedisVersion = 1.5.2
+jedisVersion = 2.0.0
 jredisVersion = 03122010
 rjcVersion= 0.6.4
 
@@ -8,6 +8,6 @@ rjcVersion= 0.6.4
 
 ## OSGi ranges
 spring.range = "[3.0.0, 4.0.0)"
-jedis.range = "[1.5.2, 2.0.0)"
+jedis.range = "[2.0.0, 2.0.0]"
 jackson.range = "[1.6, 2.0.0)"
 rjc.range = "[0.6.4, 0.6.4]"