From e5efb21d703de0124a83d03bf3611bac07faadd8 Mon Sep 17 00:00:00 2001
From: Costin Leau <cleau@vmware.com>
Date: Tue, 8 Feb 2011 18:30:28 +0200
Subject: [PATCH] + remove spring-data-keyvalue-parent + add improved
 build.gradle

---
 build.gradle                                  |  25 +-
 pom.xml                                       | 366 +------------
 spring-data-keyvalue-parent/.project          |  17 -
 .../.settings/org.maven.ide.eclipse.prefs     |   9 -
 spring-data-keyvalue-parent/pom.xml           | 508 ------------------
 spring-data-redis/build.gradle                |   2 +-
 6 files changed, 26 insertions(+), 901 deletions(-)
 delete mode 100644 spring-data-keyvalue-parent/.project
 delete mode 100644 spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs
 delete mode 100644 spring-data-keyvalue-parent/pom.xml

diff --git a/build.gradle b/build.gradle
index 4506b42b2..c5b8aa790 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,16 +45,16 @@ configure(javaprojects) {
 
 	[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:all"]
 	assemble.dependsOn generatePom
-
-  // add tasks for creating source jars and generating poms etc
-  apply from: "$buildSrcDir/maven-deployment.gradle"
-
-  // add tasks for finding and publishing .xsd files
-  apply from: "$buildSrcDir/schema-publication.gradle"
+	
+	// add tasks for creating source jars and generating poms etc
+	apply from: "$buildSrcDir/maven-deployment.gradle"
+	
+	// add tasks for finding and publishing .xsd files
+	apply from: "$buildSrcDir/schema-publication.gradle"
   
 	repositories {
 		// Public Spring artefacts
-    mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release"
+		mavenRepo name: "springsource-org-release", urls: "http://repository.springsource.com/maven/bundles/release"
 		mavenRepo name: "spring-release", urls: "http://maven.springframework.org/release"
 		mavenRepo name: "spring-milestone", urls: "http://maven.springframework.org/milestone"
 		mavenRepo name: "spring-snapshot", urls: "http://maven.springframework.org/snapshot"
@@ -111,6 +111,17 @@ ideaProject {
 // -----------------------------------------------------------------------------
 project('docs') {
     apply from: "$buildSrcDir/docs.gradle"
+    // javadoc settings
+    api.options.breakIterator = true
+    api.options.showFromProtected()
+    api.options.groups = [
+      'Spring Data Key Value Core': ['org.springframework.data.keyvalue*'], 
+      'Spring Data Redis Support' : ['org.springframework.data.keyvalue.redis*'],
+      'Spring Data Riak Support'  : ['org.springframework.data.keyvalue.riak*']]
+      
+    api.options.links = [
+        "http://static.springframework.org/spring/docs/3.0.x/javadoc-api",
+        "http://download.oracle.com/javase/6/docs/api/"]
 }
 
 apply from: "$buildSrcDir/dist.gradle"
diff --git a/pom.xml b/pom.xml
index e22db00df..aff9e42e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,367 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-keyvalue-dist</artifactId>
-  <name>Spring Data Key-Value Distribution</name>
-  <version>1.0.0.M2-SNAPSHOT</version>
+  <groupId>org.springframework.data.keyvalue</groupId>
+  <artifactId>spring-data-key-value</artifactId>
+  <version>1.0.0.M2-BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
-
-  <properties>
-    <javadoc.loc>src/main/javadoc</javadoc.loc>
-    <findbugs.skip>false</findbugs.skip>
-  </properties>
-  
+  <name>Spring Data Key Value</name>
   <modules>
-    <module>spring-data-keyvalue-parent</module>
     <module>spring-data-keyvalue-core</module>
     <module>spring-data-redis</module>
     <module>spring-data-riak</module>
   </modules>
-
-  <organization>
-    <name>SpringSource</name>
-    <url>http://www.SpringSource.org</url>
-  </organization>
-  
-  <developers>
-    <developer>
-      <id>mpollack</id>
-      <name>Mark Pollack</name>
-      <email>mpollack at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Project Admin</role>
-        <role>Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>cleau</id>
-      <name>Costin Leau</name>
-      <email>cleau at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>+2</timezone>
-    </developer>
-    <developer>
-      <id>jbrisbin</id>
-      <name>Jon Brisbin</name>
-      <email>jbrisbin at vmware.com</email>
-      <organization>SpringSource</organization>
-      <organizationUrl>http://www.SpringSource.com</organizationUrl>
-      <roles>
-        <role>Developer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-  </developers>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <comments>
-        Copyright 2010 the original author or authors.
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-        implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-      </comments>
-    </license>
-  </licenses>
-  
-  <issueManagement>
-    <system>JIRA</system>
-    <url>
-      http://jira.springframework.org/browse/DATAKV
-    </url>
-  </issueManagement>
-
-  <ciManagement>
-    <system>bamboo</system>
-    <url>http://build.springframework.org/browse/DATAKV</url>
-  </ciManagement>
-  
-  <scm>
-    <connection>
-      scm:git:git://github.com/SpringSource/spring-data-keyvalue.git
-    </connection>
-    <developerConnection>
-      scm:git:git@github.com:SpringSource/spring-data-keyvalue.git
-    </developerConnection>
-    <url>http://fisheye.springsource.org/browse/datakv</url>
-  </scm>
-
-  <inceptionYear>2010</inceptionYear>
-  
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>2.0.0.RELEASE</version>
-      </extension>
-    </extensions>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>com.agilejava.docbkx</groupId>
-        <artifactId>docbkx-maven-plugin</artifactId>
-        <version>2.0.7</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>generate-html</goal>
-              <goal>generate-pdf</goal>
-            </goals>
-            <phase>pre-site</phase>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.docbook</groupId>
-            <artifactId>docbook-xml</artifactId>
-            <version>4.4</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-        <configuration>
-          <includes>index.xml</includes>
-          <xincludeSupported>true</xincludeSupported>
-          <foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-          <htmlStylesheet>css/html.css</htmlStylesheet>
-          <chunkedOutput>false</chunkedOutput>
-          <htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-          <useExtensions>1</useExtensions>
-          <highlightSource>1</highlightSource>
-          <highlightDefaultLanguage></highlightDefaultLanguage>
-          <!-- callouts -->
-          <entities>
-            <entity>
-              <name>version</name>
-              <value>${pom.version}</value>
-            </entity>
-          </entities>
-          <postProcess>
-            <copy todir="${project.basedir}/target/site/reference">
-              <fileset dir="${project.basedir}/target/docbkx">
-                <include name="**/*.html"/>
-                <include name="**/*.pdf"/>
-              </fileset>
-            </copy>
-            <copy todir="${project.basedir}/target/site/reference/html">
-              <fileset dir="${project.basedir}/src/docbkx/resources">
-                <include name="**/*.css"/>
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-              </fileset>
-            </copy>
-            <move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-                  tofile="${project.basedir}/target/site/reference/pdf/spring-data-keyvalue-reference.pdf"
-                  failonerror="false"/>
-          </postProcess>
-        </configuration>
-      </plugin>
-      <!--
-
-        <plugin>
-          run `mvn package assembly:assembly` to trigger assembly creation.
-          see http://www.sonatype.com/books/mvnref-book/reference/assemblies-set-dist-assemblies.html
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-5</version>
-          <inherited>false</inherited>
-          <executions>
-            <execution>
-              <id>distribution</id>
-              <goals>
-                <goal>single</goal>
-              </goals>
-              <phase>package</phase>
-              <configuration>
-                <descriptors>
-                  <descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-                </descriptors>
-                <appendAssemblyId>false</appendAssemblyId>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.4</version>
-          <executions>
-            <execution>
-              <id>upload-dist</id>
-              <phase>deploy</phase>
-              <configuration>
-                <tasks>
-                  <ant antfile="${basedir}/src/ant/upload-dist.xml">
-                    <target name="upload-dist"/>
-                  </ant>
-                </tasks>
-              </configuration>
-              <goals>
-                <goal>run</goal>
-              </goals>
-            </execution>
-          </executions>
-          <dependencies>
-            <dependency>
-              <groupId>org.springframework.build</groupId>
-              <artifactId>org.springframework.build.aws.ant</artifactId>
-              <version>3.0.5.RELEASE</version>
-            </dependency>
-            <dependency>
-              <groupId>net.java.dev.jets3t</groupId>
-              <artifactId>jets3t</artifactId>
-              <version>0.7.2</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-      </plugins>
-
-      <finalName>${dist.finalName}</finalName>
-      
-      -->
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
-         <configuration>
-           <javadoc:aggregate>true</javadoc:aggregate>
-           <aggregate>true</aggregate>
-           <breakiterator>true</breakiterator>
-           <header>Spring Data Key-Value</header>
-           <source>1.5</source>
-           <show>protected</show>
-           <quiet>true</quiet>
-           <javadocDirectory>${javadoc.loc}</javadocDirectory>
-           <overview>${javadoc.loc}/overview.html</overview>
-           <stylesheetfile>${javadoc.loc}/javadoc.css</stylesheetfile>
-           <docfilessubdirs>true</docfilessubdirs>
-           
-           <groups>
-             <group>
-                <title>Spring Data Key Value Core</title>
-                <packages>org.springframework.data.keyvalue*</packages>
-             </group>            
-             <group>
-                <title>Spring Data Redis Support</title>
-                <packages>org.springframework.data.keyvalue.redis*</packages>
-             </group>            
-             <group>
-                <title>Spring Data Riak Support</title>
-                <packages>org.springframework.data.keyvalue.riak*</packages>
-             </group>            
-           </groups>
-           <links>
-             <link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
-             <link>http://download.oracle.com/javase/6/docs/api/</link>
-           </links>
-         </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-    
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jxr-maven-plugin</artifactId>
-      </plugin>
-    
-      <!-- ============== -->
-      <!--     FindBugs   -->
-      <!-- ============== -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-        <!--
-          <xmlOutput>true</xmlOutput>
-          <xmlOutputDirectory>target</xmlOutputDirectory>
-          -->
-          <threshold>Normal</threshold>
-          <effort>Default</effort>
-          <!--
-          <debug>true</debug>
-          <relaxed>true</relaxed>
-          -->
-          <skip>${findbugs.skip}</skip>
-        </configuration>
-      </plugin>
-      
-      <!-- ============== -->
-      <!--     jDepend    -->
-      <!-- ============== -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jdepend-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.6</version>        
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>            
-    </plugins>
-  </reporting>
-  
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-keyvalue/snapshot-site/
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-</project>
\ No newline at end of file
+</project>
diff --git a/spring-data-keyvalue-parent/.project b/spring-data-keyvalue-parent/.project
deleted file mode 100644
index 03147c50b..000000000
--- a/spring-data-keyvalue-parent/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-datastore-keyvalue-parent</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs b/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index a8112de66..000000000
--- a/spring-data-keyvalue-parent/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Mon Oct 11 17:02:20 EDT 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/spring-data-keyvalue-parent/pom.xml b/spring-data-keyvalue-parent/pom.xml
deleted file mode 100644
index e0b82b8d7..000000000
--- a/spring-data-keyvalue-parent/pom.xml
+++ /dev/null
@@ -1,508 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework.data</groupId>
-  <artifactId>spring-data-keyvalue-parent</artifactId>
-  <name>Spring Data Key-Value Parent</name>
-  <url>http://www.springsource.org/spring-data/data-keyvalue</url>
-  <version>1.0.0.M2-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <!-- versions for commonly-used dependencies -->
-    <junit.version>4.8.1</junit.version>
-    <log4j.version>1.2.15</log4j.version>
-    <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.mockito.version>1.8.5</org.mockito.version>
-    <org.slf4j.version>1.5.8</org.slf4j.version>
-    <org.spockframework.version>0.5-groovy-1.7-SNAPSHOT</org.spockframework.version>
-    <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
-    <!-- dist.* properties are used by the antrun tasks below -->
-    <dist.id>spring-data-keyvalue</dist.id>
-    <dist.name>Spring Data Key-Value</dist.name>
-    <dist.key>DATAKV</dist.key>
-    <dist.version>${project.version}</dist.version>
-    <dist.releaseType>snapshot</dist.releaseType>
-    <dist.finalName>${dist.id}-${dist.version}</dist.finalName>
-    <dist.fileName>${dist.finalName}.zip</dist.fileName>
-    <dist.filePath>target/${dist.fileName}</dist.filePath>
-    <dist.bucketName>dist.springframework.org</dist.bucketName>
-    
-    <!-- javadoc -->
-    <javadoc.loc>../src/main/javadoc</javadoc.loc>
-  </properties>
-
-
-
-  <profiles>
-    <profile>
-      <id>strict</id>
-      <properties>
-        <maven.test.failure.ignore>false</maven.test.failure.ignore>
-      </properties>
-    </profile>
-    <profile>
-      <id>fast</id>
-      <properties>
-        <maven.test.skip>true</maven.test.skip>
-        <maven.javadoc.skip>true</maven.javadoc.skip>
-      </properties>
-    </profile>
-    <profile>
-      <id>staging</id>
-      <distributionManagement>
-        <site>
-          <id>spring-site-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/data-keyvalue/docs
-          </url>
-        </site>
-        <repository>
-          <id>spring-milestone-staging</id>
-          <url>
-            file:///${java.io.tmpdir}/spring-data/data-keyvalue/milestone
-          </url>
-        </repository>
-        <snapshotRepository>
-          <id>spring-snapshot-staging</id>
-          <url>file:///${java.io.tmpdir}/spring-data/data-keyvalue/snapshot
-          </url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-    <profile>
-      <id>bootstrap</id>
-      <!-- TODO: move the repositories in here before release -->
-    </profile>
-  </profiles>
-
-  <dependencyManagement>
-    <!--
-        inheritable <dependency> declarations for child poms. children still
-        must explicitly declare the groupId/artifactId of these dependencies
-        in order for them to show up on the classpath, but metadata like
-        <version> and <scope> are inherited, which cuts down on verbosity.
-        see
-        http://www.sonatype.com/books/mvnref-book/reference/pom-relationships-sect-dep-manage.html
-      -->
-    <dependencies>
-
-      <!--  Spring -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${org.springframework.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${org.springframework.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${org.springframework.version}</version>
-      </dependency>
-
-      <!-- Groovy -->
-      <dependency>
-        <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-all</artifactId>
-        <version>1.7.5</version>
-      </dependency>
-
-      <!--  Spring Data -->
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-keyvalue-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework.data</groupId>
-        <artifactId>spring-data-redis</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <!-- Jackson JSON -->
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
-        <version>${org.codehaus.jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>${org.codehaus.jackson.version}</version>
-      </dependency>
-
-      <!-- Logging -->
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${org.slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl-over-slf4j</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${org.slf4j.version}</version>
-        <scope>runtime</scope>
-      </dependency>
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.jms</groupId>
-            <artifactId>jms</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jdmk</groupId>
-            <artifactId>jmxtools</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>com.sun.jmx</groupId>
-            <artifactId>jmxri</artifactId>
-          </exclusion>
-        </exclusions>
-        <scope>runtime</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>jsr250-api</artifactId>
-        <version>1.0</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>1.4.1</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>${org.mockito.version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.spockframework</groupId>
-        <artifactId>spock-spring</artifactId>
-        <version>${org.spockframework.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
-          </exclusion>
-        </exclusions>
-        <scope>test</scope>
-      </dependency>
-
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <!--
-        dependency definitions to be inherited by child poms. any
-        <dependency> declarations here will automatically show up on child
-        project classpaths. only items that are truly common across all
-        projects (modules and samples) should go here. otherwise, consider
-        <dependencyManagement> above
-      -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <extensions>
-      <extension>
-        <groupId>org.springframework.build.aws</groupId>
-        <artifactId>org.springframework.build.aws.maven</artifactId>
-        <version>2.0.0.RELEASE</version>
-      </extension>
-    </extensions>
-    <resources>
-      <resource>
-        <directory>${project.basedir}/src/main/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${project.basedir}/src/test/java</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-        <excludes>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </testResource>
-    </testResources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          <compilerArgument>-Xlint:all</compilerArgument>
-          <showWarnings>true</showWarnings>
-          <showDeprecation>false</showDeprecation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <useFile>false</useFile>
-          <includes>
-            <include>**/*Tests.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/Abstract*.java</exclude>
-            <!--<exclude>**/*IntegrationTests.java</exclude>-->
-          </excludes>
-          <junitArtifactName>junit:junit</junitArtifactName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-              <!--
-              <useDefaultManifestFile>true</useDefaultManifestFile>
-              -->
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <!--
-                 configures the springsource bundlor plugin, which generates
-                 OSGI-compatible MANIFEST.MF files during the 'compile' phase of
-                 the maven build. this plugin is declared within the
-                 pluginManagement section because not every module that inherits
-                 from this pom needs bundlor's services, e.g.:
-                 spring-integration-samples and all its children. for this reason,
-                 all modules that wish to use bundlor must declare it explicitly.
-                 it is not necessary to specify the <version> or <configuration>
-                 sections, but groupId and artifactId are required. see
-                 http://static.springsource.org/s2-bundlor/1.0.x/user-guide/html/ch04s03.html
-                 for more info
-               -->
-          <groupId>com.springsource.bundlor</groupId>
-          <artifactId>com.springsource.bundlor.maven</artifactId>
-          <version>1.0.0.RELEASE</version>
-          <configuration>
-            <failOnWarnings>true</failOnWarnings>
-          </configuration>
-          <executions>
-            <execution>
-              <id>bundlor</id>
-              <phase>compile</phase>
-              <goals>
-                <goal>bundlor</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.spockframework</groupId>
-          <artifactId>spock-maven</artifactId>
-          <version>${org.spockframework.version}</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>find-specs</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <!--
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.7</version>
-          <executions>
-            <execution>
-              <id>aggregate</id>
-              <phase>pre-site</phase>
-              <goals>
-                <goal>aggregate</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        -->
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <!-- necessary for bundlor and utils -->
-      <id>repository.plugin.springsource.release</id>
-      <name>SpringSource Maven Repository</name>
-      <url>http://repository.springsource.com/maven/bundles/release</url>
-    </pluginRepository>
-    <pluginRepository>
-      <id>spockframework</id>
-      <name>Spock Framework</name>
-      <url>http://m2repo.spockframework.org/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <repositories>
-    <repository>
-      <id>repository.springframework.maven.release</id>
-      <name>Spring Framework Maven Release Repository</name>
-      <url>http://maven.springframework.org/release</url>
-    </repository>
-    <repository>
-      <id>repository.springframework.maven.milestone</id>
-      <name>Spring Framework Maven Milestone Repository</name>
-      <url>http://maven.springframework.org/milestone</url>
-    </repository>
-    <repository>
-      <id>repository.springframework.maven.snapshot</id>
-      <name>Spring Framework Maven Snapshot Repository</name>
-      <url>http://maven.springframework.org/snapshot</url>
-    </repository>
-    <repository>
-      <id>spring-ext</id>
-      <name>Spring External Dependencies Repository</name>
-      <url>
-        http://springframework.svn.sourceforge.net/svnroot/springframework/repos/repo-ext/
-      </url>
-    </repository>
-    <repository>
-      <id>spockframework</id>
-      <name>Spock Framework</name>
-      <url>http://m2repo.spockframework.org/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <!--
-              significantly speeds up the 'Dependencies' report during site
-              creation see
-              http://old.nabble.com/Skipping-dependency-report-during-Maven2-site-generation-td20116761.html
-            -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <distributionManagement>
-    <!-- see 'staging' profile for dry-run deployment settings -->
-    <downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
-    <site>
-      <id>static.springframework.org</id>
-      <url>
-        scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-keyvalue/snapshot-site/
-      </url>
-    </site>
-    <repository>
-      <id>spring-milestone</id>
-      <name>Spring Milestone Repository</name>
-      <url>s3://maven.springframework.org/milestone</url>
-    </repository>
-    <snapshotRepository>
-      <id>spring-snapshot</id>
-      <name>Spring Snapshot Repository</name>
-      <url>s3://maven.springframework.org/snapshot</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-</project>
\ No newline at end of file
diff --git a/spring-data-redis/build.gradle b/spring-data-redis/build.gradle
index f154b205b..ce522c299 100644
--- a/spring-data-redis/build.gradle
+++ b/spring-data-redis/build.gradle
@@ -9,4 +9,4 @@ dependencies {
 	compile "redis.clients:jedis:$jedisVersion"
 	compile "org.jredis:jredis-anthonylauzon:$jredisVersion"
 	compile "org.springframework:spring-oxm:$springVersion"
-}
+}
\ No newline at end of file