diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 942fbaea..6f044323 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -15,8 +15,12 @@
 	<description>Sample projects for Spring Data Elasticsearch</description>
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
+	<properties>
+		<elasticsearch.version>2.2.0</elasticsearch.version>
+	</properties>
+
 	<modules>
-		<module>example</module>
+		<!--<module>example</module>-->
 	</modules>
 
 	<dependencies>
diff --git a/jpa/query-by-example/pom.xml b/jpa/query-by-example/pom.xml
index 351caaf8..0a2ee143 100644
--- a/jpa/query-by-example/pom.xml
+++ b/jpa/query-by-example/pom.xml
@@ -10,9 +10,5 @@
 
 	<artifactId>spring-data-jpa-query-by-example</artifactId>
 	<name>Spring Data JPA - Query-by-Example (QBE)</name>
-	
-	<properties>
-		<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
 
 </project>
diff --git a/mongodb/query-by-example/pom.xml b/mongodb/query-by-example/pom.xml
index f723882d..a0652f4c 100644
--- a/mongodb/query-by-example/pom.xml
+++ b/mongodb/query-by-example/pom.xml
@@ -11,8 +11,4 @@
 	<artifactId>spring-data-mongodb-query-by-example</artifactId>
 	<name>Spring Data MongoDB - Query-by-Example (QBE)</name>
 
-	<properties>
-		<spring-data-releasetrain.version>Hopper-BUILD-SNAPSHOT</spring-data-releasetrain.version>
-	</properties>
-
 </project>
diff --git a/neo4j/example/pom.xml b/neo4j/example/pom.xml
index 5e3ecfbe..cc6afdfc 100644
--- a/neo4j/example/pom.xml
+++ b/neo4j/example/pom.xml
@@ -1,14 +1,13 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-data-neo4j-example</artifactId>
 	<name>Spring Data Neo4j - Example</name>
 
 	<properties>
-		<neo4j-ogm.version>2.0.0-M02</neo4j-ogm.version>
+		<neo4j-ogm.version>2.0.0-M04</neo4j-ogm.version>
 	</properties>
 
 	<parent>
@@ -26,9 +25,11 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-rest</artifactId>
+			<groupId>org.neo4j</groupId>
+			<artifactId>neo4j-ogm-embedded-driver</artifactId>
+			<version>${neo4j-ogm.version}</version>
 		</dependency>
+
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 57c8266f..b52234d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
 		<apt.version>1.1.3</apt.version>
 		<java.version>1.8</java.version>
 		<querydsl.version>4.0.8</querydsl.version>
+		<spring-data-releasetrain.version>Hopper-RC1</spring-data-releasetrain.version>
 
 	</properties>
 
@@ -71,7 +72,6 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.6</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/redis/repositories/pom.xml b/redis/repositories/pom.xml
index 60c396fe..923782e6 100644
--- a/redis/repositories/pom.xml
+++ b/redis/repositories/pom.xml
@@ -12,10 +12,6 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<properties>
-		<spring-data-releasetrain.version>Hopper-RC1</spring-data-releasetrain.version>
-	</properties>
-
 	<dependencies>
 
 		<dependency>
diff --git a/rest/uri-customization/src/main/java/example/springdata/rest/uris/SpringDataRestCustomization.java b/rest/uri-customization/src/main/java/example/springdata/rest/uris/SpringDataRestCustomization.java
index e512e8e7..f224b0b9 100644
--- a/rest/uri-customization/src/main/java/example/springdata/rest/uris/SpringDataRestCustomization.java
+++ b/rest/uri-customization/src/main/java/example/springdata/rest/uris/SpringDataRestCustomization.java
@@ -34,7 +34,7 @@ public class SpringDataRestCustomization extends RepositoryRestConfigurerAdapter
 	@Override
 	public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) {
 
-		config.withCustomEntityLookup().//
+		config.withEntityLookup().//
 				forRepository(UserRepository.class, User::getUsername, UserRepository::findByUsername);
 	}
 }