From 5f7ec0f05e9526c7c2964ec1f2e24a86bead989d Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 18 Sep 2012 14:19:28 -0700
Subject: [PATCH 1/6] [artifactory-release] Release version 2.1.0.RC4

---
 pom.xml                               | 2 +-
 spring-data-neo4j-aspects/pom.xml     | 4 ++--
 spring-data-neo4j-cross-store/pom.xml | 4 ++--
 spring-data-neo4j-parent/pom.xml      | 8 ++++----
 spring-data-neo4j-rest/pom.xml        | 8 ++++----
 spring-data-neo4j-tx/pom.xml          | 2 +-
 spring-data-neo4j/pom.xml             | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd83886fc..f1f1f2759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <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.RC4</version>
     <packaging>pom</packaging>
     <modules>
         <module>spring-data-neo4j-parent</module>
diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml
index 5663860db..f62e71c63 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.RC4</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.RC4</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..ab299ec91 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.RC4</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.RC4</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml
index 04f95b51b..2e958bbc9 100644
--- a/spring-data-neo4j-parent/pom.xml
+++ b/spring-data-neo4j-parent/pom.xml
@@ -4,7 +4,7 @@
   <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.RC4</version>
   <packaging>pom</packaging>
   <description><![CDATA[Spring Data Neo4j parent project. Defines dependencies and common configuration for the build process.
     ]]></description>
@@ -289,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.RC4</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.RC4</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.RC4</version>
       </dependency>
 
       <!-- Logging -->
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index 5525f2d7f..c2bac4206 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.RC4</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.RC4</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.RC4</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.RC4</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..d549d654c 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.RC4</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 957ceef27..ca13b4aaf 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.RC4</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j</artifactId>

From 03ab3e0d39fb094ffd79a04b42291f98e07a353d Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 18 Sep 2012 14:19:34 -0700
Subject: [PATCH 2/6] [artifactory-release] Next development version
 2.1.0.BUILD-SNAPSHOT

---
 pom.xml                               | 2 +-
 spring-data-neo4j-aspects/pom.xml     | 4 ++--
 spring-data-neo4j-cross-store/pom.xml | 4 ++--
 spring-data-neo4j-parent/pom.xml      | 8 ++++----
 spring-data-neo4j-rest/pom.xml        | 8 ++++----
 spring-data-neo4j-tx/pom.xml          | 2 +-
 spring-data-neo4j/pom.xml             | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1f1f2759..cd83886fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <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.RC4</version>
+    <version>2.1.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>spring-data-neo4j-parent</module>
diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml
index f62e71c63..5663860db 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.RC4</version>
+		<version>2.1.0.BUILD-SNAPSHOT</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.RC4</version>
+            <version>2.1.0.BUILD-SNAPSHOT</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 ab299ec91..b25f89344 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.RC4</version>
+		<version>2.1.0.BUILD-SNAPSHOT</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.RC4</version>
+            <version>2.1.0.BUILD-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Logging -->
diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml
index 2e958bbc9..04f95b51b 100644
--- a/spring-data-neo4j-parent/pom.xml
+++ b/spring-data-neo4j-parent/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-neo4j-parent</artifactId>
   <name>Spring Data Neo4j Parent</name>
-  <version>2.1.0.RC4</version>
+  <version>2.1.0.BUILD-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description><![CDATA[Spring Data Neo4j parent project. Defines dependencies and common configuration for the build process.
     ]]></description>
@@ -289,17 +289,17 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j</artifactId>
-        <version>2.1.0.RC4</version>
+        <version>2.1.0.BUILD-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-aspects</artifactId>
-        <version>2.1.0.RC4</version>
+        <version>2.1.0.BUILD-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-neo4j-tx</artifactId>
-        <version>2.1.0.RC4</version>
+        <version>2.1.0.BUILD-SNAPSHOT</version>
       </dependency>
 
       <!-- Logging -->
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index c2bac4206..773c388ce 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.RC4</version>
+        <version>2.1.0.BUILD-SNAPSHOT</version>
         <relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
     </parent>
     <artifactId>spring-data-neo4j-rest</artifactId>
     <packaging>jar</packaging>
-    <version>2.1.0.RC4</version>
+    <version>2.1.0.BUILD-SNAPSHOT</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>2.1.0.RC4</version>
+            <version>2.1.0.BUILD-SNAPSHOT</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>2.1.0.RC4</version>
+            <version>2.1.0.BUILD-SNAPSHOT</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 d549d654c..e5e4e0d79 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.RC4</version>
+		<version>2.1.0.BUILD-SNAPSHOT</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 ca13b4aaf..957ceef27 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.RC4</version>
+		<version>2.1.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-data-neo4j-parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>spring-data-neo4j</artifactId>

From 9f82155234cbba3e0056171370c5feb8413527e4 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <johannes.mockenhaupt@arcor.de>
Date: Tue, 18 Sep 2012 08:23:15 +0200
Subject: [PATCH 3/6] Remove outdated note on Eclipse Juno support.

Installing a snapshot version of AJDT (unreleased version 2.2.1)
is enough to pull in AspectJ 1.7.1 as well as SDN-related fixes
to AJDT, creating a working IDE integration.
---
 src/docbkx/reference/programming-model/aspectj.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/docbkx/reference/programming-model/aspectj.xml b/src/docbkx/reference/programming-model/aspectj.xml
index 94ba6d70b..ecec21d6d 100644
--- a/src/docbkx/reference/programming-model/aspectj.xml
+++ b/src/docbkx/reference/programming-model/aspectj.xml
@@ -50,8 +50,7 @@
             <ulink url="http://www.eclipse.org/ajdt/downloads/">http://www.eclipse.org/ajdt/downloads/</ulink>
             (it might be necessary to use the latest development snapshot of the plugin).
             The current version that does not show incorrect errors is AspectJ 1.6.12 (included in STS 2.8.0), previous versions are reported
-            to mislead the user. Note that as of Spring Data Neo4j version 2.0.1 the AspectJ version 1.7.0 is not yet supported. This also
-            means that AJDT 2.2.0 on Eclipse 4.2 is not yet supported as this version of AJDT internally uses AspectJ 1.7.0.
+            to mislead the user.
         </para>
         <note>
         <para>

From 866102571a704b407effa966c46208272ce6e687 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <johannes.mockenhaupt@arcor.de>
Date: Wed, 19 Sep 2012 22:28:49 +0200
Subject: [PATCH 4/6] Add note about AJDT requiring builds after start.

After Eclipse starts Aspect markers are still displayed but
autocompletion, references etc. are only available once a projects has
been (cleaned and re)build. This is currently expected behavior, see
https://bugs.eclipse.org/bugs/show_bug.cgi?id=389682#c10
---
 src/docbkx/reference/programming-model/aspectj.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/docbkx/reference/programming-model/aspectj.xml b/src/docbkx/reference/programming-model/aspectj.xml
index ecec21d6d..bb6645fb0 100644
--- a/src/docbkx/reference/programming-model/aspectj.xml
+++ b/src/docbkx/reference/programming-model/aspectj.xml
@@ -50,7 +50,8 @@
             <ulink url="http://www.eclipse.org/ajdt/downloads/">http://www.eclipse.org/ajdt/downloads/</ulink>
             (it might be necessary to use the latest development snapshot of the plugin).
             The current version that does not show incorrect errors is AspectJ 1.6.12 (included in STS 2.8.0), previous versions are reported
-            to mislead the user.
+            to mislead the user. Note that the AJDT (as of September 2012) requires projects to be rebuild after Eclipse is started to fully
+            support all advanced features.
         </para>
         <note>
         <para>

From 9f9b7179d629ae2d219cf691012773d9b759b21d Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <johannes.mockenhaupt@arcor.de>
Date: Wed, 19 Sep 2012 23:00:15 +0200
Subject: [PATCH 5/6] Fix test to test against the correct object.

---
 .../src/test/java/org/neo4j/cineasts/domain/DomainTest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java
index 114ec458c..8150ebb9e 100644
--- a/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java
+++ b/spring-data-neo4j-examples/cineasts-aspects/src/test/java/org/neo4j/cineasts/domain/DomainTest.java
@@ -65,9 +65,8 @@ public class DomainTest {
         User user = new User("ich","Micha","password").persist();
         Rating awesome = user.rate(movie, 5, "Awesome");
 
-
         User foundUser = userRepository.findByPropertyValue("login", "ich");
-        Rating rating = user.getRatings().iterator().next();
+        Rating rating = foundUser.getRatings().iterator().next();
         assertEquals(awesome,rating);
         assertEquals("Awesome",rating.getComment());
         assertEquals(5,rating.getStars());

From 896199d014eca78c21c21ab4e058c1578c226fcb Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <johannes.mockenhaupt@arcor.de>
Date: Wed, 19 Sep 2012 23:16:46 +0200
Subject: [PATCH 6/6] Typo.

---
 src/docbkx/reference/programming-model/aspectj.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/docbkx/reference/programming-model/aspectj.xml b/src/docbkx/reference/programming-model/aspectj.xml
index bb6645fb0..a7c55b557 100644
--- a/src/docbkx/reference/programming-model/aspectj.xml
+++ b/src/docbkx/reference/programming-model/aspectj.xml
@@ -50,7 +50,7 @@
             <ulink url="http://www.eclipse.org/ajdt/downloads/">http://www.eclipse.org/ajdt/downloads/</ulink>
             (it might be necessary to use the latest development snapshot of the plugin).
             The current version that does not show incorrect errors is AspectJ 1.6.12 (included in STS 2.8.0), previous versions are reported
-            to mislead the user. Note that the AJDT (as of September 2012) requires projects to be rebuild after Eclipse is started to fully
+            to mislead the user. Note that AJDT (as of September 2012) requires projects to be rebuild after Eclipse is started to fully
             support all advanced features.
         </para>
         <note>