Merge branch '1.5.x'

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -3503,6 +3503,13 @@ persistence for the embedded mode:
 	spring.data.neo4j.uri=file://var/tmp/graph.db
 ----
 
+[NOTE]
+====
+The Neo4j OGM embedded driver does not provide the Neo4j kernel. Users are expected to
+provide this dependency manually, see
+http://neo4j.com/docs/ogm-manual/current/reference/#reference:getting-started[the documentation]
+for more details.
+====
 
 
 [[boot-features-neo4j-ogm-session]]

spring-boot-samples/spring-boot-sample-data-neo4j/README.adoc

@@ -11,13 +11,6 @@ spring.data.neo4j.password=secret
 
 You can also locally add the embedded driver to embed Neo4j instead. Note
 that Spring Boot does not provide dependency management for that GPL-licensed
-library:
-
-```
-<dependency>
-    <groupId>org.neo4j</groupId>
-    <artifactId>neo4j-ogm-embedded-driver</artifactId>
-    <version>${neo4j-ogm.version}</version>
-</dependency>
-```
-
+library, see
+http://docs.spring.io/spring-data/neo4j/docs/4.2.x/reference/html/#reference.getting_started.driver[the official documentation]
+for more details.