Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -368,25 +368,6 @@
       }
     ]
   },
-  {
-    "name": "spring.data.neo4j.session.scope",
-    "values": [
-      {
-        "value": "singleton"
-      },
-      {
-        "value": "session"
-      },
-      {
-        "value": "request"
-      }
-    ],
-    "providers": [
-      {
-        "name": "any"
-      }
-    ]
-  },
   {
     "name": "spring.datasource.driver-class-name",
     "providers": [

spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

@@ -577,9 +577,9 @@ content into your application; rather pick only the properties that you need.
 	# NEO4J ({sc-spring-boot-autoconfigure}/neo4j/Neo4jProperties.{sc-ext}[Neo4jProperties])
 	spring.data.neo4j.compiler= # Compiler to use.
 	spring.data.neo4j.embedded.enabled=true # Enable embedded mode if the embedded driver is available.
+	spring.data.neo4j.open-in-view=false # Register OpenSessionInViewInterceptor. Binds a Neo4j Session to the thread for the entire processing of the request.
 	spring.data.neo4j.password= # Login password of the server.
 	spring.data.neo4j.repositories.enabled=true # Enable Neo4j repositories.
-	spring.data.neo4j.session.scope=singleton # Scope (lifetime) of the session.
 	spring.data.neo4j.uri= # URI used by the driver. Auto-detected by default.
 	spring.data.neo4j.username= # Login user of the server.
 

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

@@ -3399,11 +3399,13 @@ persistence for the embedded mode:
 [[boot-features-neo4j-ogm-session]]
 ==== Neo4jSession
 
-By default, the lifetime of the session is scope to the application. If you are running a
+By default, the lifetime of the session is scoped to the application. If you are running a
-web application you can change it to scope or request easily:
+web application, you can change it so that the session is bound to the thread for the
+entire processing of the request (i.e. the "Open Session in View" pattern):
+
 
 ----
-	spring.data.neo4j.session.scope=session
+	spring.data.neo4j.open-in-view=true
 ----