diff --git a/pom.xml b/pom.xml
index 473543650..b4f0c40e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
 <?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 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-neo4j-dist</artifactId>
     <name>Spring Data Neo4j Distribution</name>
     <description><![CDATA[Within the Spring Data project the Spring Data Neo4j library provides integration with the Neo4j graph database, offering object graph mapping, a Neo4jTemplate and Spring-Data-Commons Repository implementations.
     ]]></description>
-    <version>2.1.0.BUILD-SNAPSHOT</version>
+    <version>2.1.0.RC3</version>
     <packaging>pom</packaging>
     <modules>
         <module>spring-data-neo4j-parent</module>
@@ -327,26 +326,25 @@
                             <htmlCustomization>${docbook.generatedDir}/resources/xsl/html.xsl</htmlCustomization>
                             <useExtensions>1</useExtensions>
                             <highlightSource>1</highlightSource>
-                            <highlightDefaultLanguage/>
+                            <highlightDefaultLanguage />
                             <postProcess>
-                                <move tofile="${basedir}/target/site/reference/html/index.html"
-                                      file="${basedir}/target/docbkx/html/index.html"/>
+                                <move tofile="${basedir}/target/site/reference/html/index.html" file="${basedir}/target/docbkx/html/index.html" />
 
                                 <copy todir="${basedir}/target/site/reference/html" flatten="true">
                                     <fileset dir="${basedir}/target/classes/">
-                                        <exclude name="${docbook.generatedDir}/resources/*"/>
-                                        <include name="**/*.png"/>
-                                        <include name="**/*.gif"/>
-                                        <include name="**/*.jpg"/>
+                                        <exclude name="${docbook.generatedDir}/resources/*" />
+                                        <include name="**/*.png" />
+                                        <include name="**/*.gif" />
+                                        <include name="**/*.jpg" />
                                     </fileset>
                                 </copy>
 
                                 <copy todir="${basedir}/target/site/reference/html">
                                     <fileset dir="${docbook.generatedDir}/resources">
-                                        <include name="**/*.css"/>
-                                        <include name="**/*.png"/>
-                                        <include name="**/*.gif"/>
-                                        <include name="**/*.jpg"/>
+                                        <include name="**/*.css" />
+                                        <include name="**/*.png" />
+                                        <include name="**/*.gif" />
+                                        <include name="**/*.jpg" />
                                     </fileset>
                                 </copy>
                             </postProcess>
@@ -388,11 +386,9 @@
                             <includes>index.xml</includes>
                             <useExtensions>1</useExtensions>
                             <highlightSource>1</highlightSource>
-                            <highlightDefaultLanguage/>
+                            <highlightDefaultLanguage />
                             <postProcess>
-                                <copy file="${basedir}/target/docbkx/pdf/index.pdf"
-                                      tofile="${basedir}/target/site/reference/pdf/spring-data-neo4j-reference.pdf"
-                                      failonerror="false"/>
+                                <copy file="${basedir}/target/docbkx/pdf/index.pdf" tofile="${basedir}/target/site/reference/pdf/spring-data-neo4j-reference.pdf" failonerror="false" />
                             </postProcess>
                         </configuration>
                         <phase>pre-site</phase>
@@ -410,11 +406,9 @@
                             <useExtensions>1</useExtensions>
                             <highlightSource>1</highlightSource>
                             <includes>tutorial.xml</includes>
-                            <highlightDefaultLanguage/>
+                            <highlightDefaultLanguage />
                             <postProcess>
-                                <copy file="${basedir}/target/docbkx/pdf/tutorial.pdf"
-                                      tofile="${basedir}/target/site/reference/pdf/spring-data-neo4j-tutorial.pdf"
-                                      failonerror="false"/>
+                                <copy file="${basedir}/target/docbkx/pdf/tutorial.pdf" tofile="${basedir}/target/site/reference/pdf/spring-data-neo4j-tutorial.pdf" failonerror="false" />
                             </postProcess>
                         </configuration>
                         <phase>pre-site</phase>
@@ -431,28 +425,28 @@
                             <htmlCustomization>${docbook.generatedDir}/resources/xsl/html_chunk.xsl</htmlCustomization>
                             <useExtensions>1</useExtensions>
                             <highlightSource>1</highlightSource>
-                            <highlightDefaultLanguage/>
+                            <highlightDefaultLanguage />
                             <targetDirectory>${basedir}/target/docbkx/multi/</targetDirectory>
                             <postProcess>
                                 <move todir="${basedir}/target/site/reference/multi">
                                     <fileset dir="${basedir}/target/docbkx/multi">
-                                        <include name="**/*.html"/>
+                                        <include name="**/*.html" />
                                     </fileset>
                                 </move>
                                 <copy todir="${basedir}/target/site/reference/multi">
                                     <fileset dir="${docbook.generatedDir}/resources">
-                                        <include name="**/*.png"/>
-                                        <include name="**/*.gif"/>
-                                        <include name="**/*.jpg"/>
+                                        <include name="**/*.png" />
+                                        <include name="**/*.gif" />
+                                        <include name="**/*.jpg" />
                                     </fileset>
                                 </copy>
                                 <copy todir="${basedir}/target/site/reference/multi" flatten="true">
                                     <fileset dir="${docbook.generatedDir}">
-                                        <exclude name="${docbook.generatedDir}/resources/*"/>
-                                        <include name="**/*.css"/>
-                                        <include name="**/*.png"/>
-                                        <include name="**/*.gif"/>
-                                        <include name="**/*.jpg"/>
+                                        <exclude name="${docbook.generatedDir}/resources/*" />
+                                        <include name="**/*.css" />
+                                        <include name="**/*.png" />
+                                        <include name="**/*.gif" />
+                                        <include name="**/*.jpg" />
                                     </fileset>
                                 </copy>
                             </postProcess>
@@ -476,7 +470,7 @@
                 <configuration>
                     <includes>index.xml</includes>
                     <chunkedOutput>false</chunkedOutput>
-                    <draftWatermarkImage/>
+                    <draftWatermarkImage />
                     <htmlStylesheet>css/html.css</htmlStylesheet>
                     <sourceDirectory>${docbook.generatedDir}/</sourceDirectory>
                     <!--foCustomization>${docbook.generatedDir}/resources/xsl/fopdf.xsl</foCustomization-->
@@ -550,7 +544,7 @@
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/src/ant/upload-dist.xml">
-                                    <target name="upload-dist"/>
+                                    <target name="upload-dist" />
                                 </ant>
                             </tasks>
                         </configuration>
diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml
index 5663860db..273c97425 100644
--- a/spring-data-neo4j-aspects/pom.xml
+++ b/spring-data-neo4j-aspects/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-neo4j-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.RC3</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j-aspects</artifactId>
@@ -44,7 +44,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-neo4j</artifactId>
-            <version>2.1.0.BUILD-SNAPSHOT</version>
+            <version>2.1.0.RC3</version>
             <type>test-jar</type>
             <scope>test</scope>
 		</dependency>
diff --git a/spring-data-neo4j-cross-store/pom.xml b/spring-data-neo4j-cross-store/pom.xml
index b25f89344..ea97b3936 100644
--- a/spring-data-neo4j-cross-store/pom.xml
+++ b/spring-data-neo4j-cross-store/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-neo4j-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.RC3</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j-cross-store</artifactId>
@@ -53,7 +53,7 @@
 			<artifactId>spring-data-neo4j</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
-            <version>2.1.0.BUILD-SNAPSHOT</version>
+            <version>2.1.0.RC3</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml
index f994416d3..bcade966c 100644
--- a/spring-data-neo4j-parent/pom.xml
+++ b/spring-data-neo4j-parent/pom.xml
@@ -1,11 +1,10 @@
 <?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 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-neo4j-parent</artifactId>
   <name>Spring Data Neo4j Parent</name>
-  <version>2.1.0.BUILD-SNAPSHOT</version>
+  <version>2.1.0.RC3</version>
   <packaging>pom</packaging>
   <description><![CDATA[Spring Data Neo4j parent project. Defines dependencies and common configuration for the build process.
     ]]></description>
@@ -290,17 +289,17 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j</artifactId>
-        <version>2.1.0.BUILD-SNAPSHOT</version>
+        <version>2.1.0.RC3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-aspects</artifactId>
-        <version>2.1.0.BUILD-SNAPSHOT</version>
+        <version>2.1.0.RC3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-tx</artifactId>
-        <version>2.1.0.BUILD-SNAPSHOT</version>
+        <version>2.1.0.RC3</version>
       </dependency>
 
       <!-- Logging -->
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index 476e1985e..cdeb603b0 100644
--- a/spring-data-neo4j-rest/pom.xml
+++ b/spring-data-neo4j-rest/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-parent</artifactId>
-        <version>2.1.0.BUILD-SNAPSHOT</version>
+        <version>2.1.0.RC3</version>
         <relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-neo4j-rest</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.0.BUILD-SNAPSHOT</version>
+    <version>2.1.0.RC3</version>
     <name>Spring Data Neo4j REST Wrapper</name>
     <description><![CDATA[Spring Data Neo4j Wrapper for the Neo4j REST API, provides a Graph Database proxy for the remote invocation.
     ]]></description>
@@ -233,7 +233,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-neo4j</artifactId>
-            <version>${project.version}</version>
+            <version>2.1.0.RC3</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
@@ -241,7 +241,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-neo4j-aspects</artifactId>
-            <version>${project.version}</version>
+            <version>2.1.0.RC3</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
diff --git a/spring-data-neo4j-tx/pom.xml b/spring-data-neo4j-tx/pom.xml
index e5e4e0d79..9d5dac3c1 100644
--- a/spring-data-neo4j-tx/pom.xml
+++ b/spring-data-neo4j-tx/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-neo4j-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.RC3</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j-tx</artifactId>
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index aabd0e5db..3da64763d 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-neo4j-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.RC3</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j</artifactId>