diff --git a/build/ivy/settings/ivy.xml b/build/ivy/settings/ivy.xml
index 860761182..3e7f55830 100644
--- a/build/ivy/settings/ivy.xml
+++ b/build/ivy/settings/ivy.xml
@@ -6,9 +6,9 @@
 			<exclude module="jmxtools"/>
 			<exclude module="jmxri"/>
 		</dependency>
-		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
-		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
-		<dependency org="org.neo4j" name="neo4j-community" rev="1.5"/>
+		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
+		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
+		<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
 		<dependency org="junit" name="junit" rev="4.8.1"/>
 	</dependencies>
 </ivy-module>
diff --git a/spring-data-neo4j-examples/hello-worlds-aspects/build.gradle b/spring-data-neo4j-examples/hello-worlds-aspects/build.gradle
index c4b693f2d..7ffdbf9b7 100644
--- a/spring-data-neo4j-examples/hello-worlds-aspects/build.gradle
+++ b/spring-data-neo4j-examples/hello-worlds-aspects/build.gradle
@@ -5,9 +5,9 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 
-springVersion = "3.0.5.RELEASE"
-springDataNeo4jVersion = "1.1.0.RELEASE"
-aspectjVersion = "1.6.11.RELEASE"
+springVersion = "3.0.7.RELEASE"
+springDataNeo4jVersion = "2.0.0.RELEASE"
+aspectjVersion = "1.6.12"
 
 apply from:'https://github.com/SpringSource/spring-data-neo4j/raw/master/build/gradle/springdataneo4j.gradle'
 
diff --git a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml
index 2564c1bf5..d1bd7bcfa 100644
--- a/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml
+++ b/spring-data-neo4j-examples/hello-worlds-aspects/settings/ivy.xml
@@ -1,14 +1,14 @@
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
 	<info organisation="org.springframework.data.neo4j.examples" module="hello-worlds"/>
 	<dependencies>
-		<dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
+		<dependency org="org.springframework.data" name="spring-data-neo4j" rev="2.0.0.RELEASE">
 			<exclude module="jms"/>
 			<exclude module="jmxtools"/>
 			<exclude module="jmxri"/>
 		</dependency>
-		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
-		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
-		<dependency org="org.neo4j" name="neo4j-community" rev="1.3"/>
+		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.12"/>
+		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.12"/>
+		<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
 		<dependency org="junit" name="junit" rev="4.8.1"/>
 	</dependencies>
 </ivy-module>
diff --git a/spring-data-neo4j-examples/hello-worlds/build.gradle b/spring-data-neo4j-examples/hello-worlds/build.gradle
index c4b693f2d..7b2c1ccd5 100644
--- a/spring-data-neo4j-examples/hello-worlds/build.gradle
+++ b/spring-data-neo4j-examples/hello-worlds/build.gradle
@@ -5,11 +5,8 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 
-springVersion = "3.0.5.RELEASE"
-springDataNeo4jVersion = "1.1.0.RELEASE"
-aspectjVersion = "1.6.11.RELEASE"
-
-apply from:'https://github.com/SpringSource/spring-data-neo4j/raw/master/build/gradle/springdataneo4j.gradle'
+springVersion = "3.0.7.RELEASE"
+springDataNeo4jVersion = "2.0.0.RELEASE"
 
 configurations {
     runtime
diff --git a/spring-data-neo4j-examples/hello-worlds/build.xml b/spring-data-neo4j-examples/hello-worlds/build.xml
index 60a0d7f3d..c975fc6cf 100644
--- a/spring-data-neo4j-examples/hello-worlds/build.xml
+++ b/spring-data-neo4j-examples/hello-worlds/build.xml
@@ -7,8 +7,6 @@
 	<import file="${settings.dir}/install-ivy.xml" />
 	<import file="${settings.dir}/path.xml" />
 
-	<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="${lib.dir}/aspectjtools.jar"/>
-
 	<target name="lib.retrieve" depends="install-ivy">
 		<mkdir dir="${lib.dir}" />
 		<ivy:settings file="${settings.dir}/ivysettings.xml" />
@@ -29,14 +27,8 @@
 	<target name="compile" description="Compile production classes" depends="lib.retrieve">
 		<mkdir dir="${main.target}" />
 
-		<iajc sourceroots="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
-			<aspectpath>
-				<pathelement location="${lib.dir}/spring-aspects.jar"/>
-			</aspectpath>
-			<aspectpath>
-				<pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
-			</aspectpath>
-		</iajc>
+		<javac sourcepath="${main.src}" destDir="${main.target}" classpathref="path.libs" source="1.6">
+		</javac>
 	</target>
 
 	<target name="compile-tests" description="Compile unit test classes" depends="compile">
@@ -44,14 +36,8 @@
         <copy todir="${main.target}"  failonerror="false">
             <fileset dir="${main.resources}"/>
         </copy>
-        <iajc sourceroots="${test.src}" destDir="${test.target}" classpathref="path.testing" source="1.6">
-            <aspectpath>
-                <pathelement location="${lib.dir}/spring-aspects.jar"/>
-            </aspectpath>
-            <aspectpath>
-                <pathelement location="${lib.dir}/spring-data-neo4j.jar"/>
-            </aspectpath>
-        </iajc>
+        <javac sourcepath="${test.src}" destDir="${test.target}" classpathref="path.testing" source="1.6">
+        </javac>
 	</target>
 
 	<target name="test" depends="clean, compile, compile-tests">
diff --git a/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml b/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml
index 2564c1bf5..58f5da722 100644
--- a/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml
+++ b/spring-data-neo4j-examples/hello-worlds/settings/ivy.xml
@@ -1,14 +1,12 @@
 <ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
 	<info organisation="org.springframework.data.neo4j.examples" module="hello-worlds"/>
 	<dependencies>
-		<dependency org="org.springframework.data" name="spring-data-neo4j" rev="1.0.0.RELEASE">
+		<dependency org="org.springframework.data" name="spring-data-neo4j" rev="2.0.0.RELEASE">
 			<exclude module="jms"/>
 			<exclude module="jmxtools"/>
 			<exclude module="jmxri"/>
 		</dependency>
-		<dependency org="org.aspectj" name="aspectjrt" rev="1.6.11.RELEASE"/>
-		<dependency org="org.aspectj" name="aspectjtools" rev="1.6.11.RELEASE"/>
-		<dependency org="org.neo4j" name="neo4j-community" rev="1.3"/>
+		<dependency org="org.neo4j" name="neo4j-community" rev="1.6.M02"/>
 		<dependency org="junit" name="junit" rev="4.8.1"/>
 	</dependencies>
 </ivy-module>
diff --git a/src/docbkx/tutorial/neo4j.xml b/src/docbkx/tutorial/neo4j.xml
index d4690abbd..5129504a8 100644
--- a/src/docbkx/tutorial/neo4j.xml
+++ b/src/docbkx/tutorial/neo4j.xml
@@ -40,7 +40,7 @@
             <programlisting language="xml" ><![CDATA[<dependency>
     <groupId>org.neo4j</groupId>
     <artifactId>neo4j</artifactId>
-    <version>1.5</version>
+    <version>1.6.M02</version>
 </dependency>
 ]]></programlisting>
         </example>
diff --git a/src/docbkx/tutorial/setup.xml b/src/docbkx/tutorial/setup.xml
index 730265306..87d93cc1b 100644
--- a/src/docbkx/tutorial/setup.xml
+++ b/src/docbkx/tutorial/setup.xml
@@ -32,7 +32,7 @@
             <example>
                 <title>Project pom.xml</title>
                 <programlisting language="xml"><![CDATA[<properties>
-    <spring.version>3.0.6.RELEASE</spring.version>
+    <spring.version>3.0.7.RELEASE</spring.version>
 </properties>
 
 <dependencies>