From 062dc3cb9ac41f61a37ebcce182ed81e7f053d45 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 29 May 2017 11:48:55 +0200
Subject: [PATCH 1/2] Upgrade to Neo4J OGM 2.1.3

Closes gh-9335
---
 .../boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java  | 5 +++--
 spring-boot-dependencies/pom.xml                             | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
index 6ee0b993e0..a185883dd6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,7 +104,8 @@ public class Neo4jPropertiesTests {
 				"spring.data.neo4j.uri=http://user:secret@my-server:7474");
 		Configuration configuration = properties.createConfiguration();
 		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
-				"http://user:secret@my-server:7474");
+				"http://my-server:7474");
+		assertCredentials(configuration, "user", "secret");
 		assertCredentials(configuration, "user", "secret");
 	}
 
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 3b4b1e153e..b9b6e2cc83 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -137,7 +137,7 @@
 		<mysql.version>5.1.42</mysql.version>
 		<narayana.version>5.5.24.Final</narayana.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
-		<neo4j-ogm.version>2.1.2</neo4j-ogm.version>
+		<neo4j-ogm.version>2.1.3</neo4j-ogm.version>
 		<postgresql.version>9.4.1212.jre7</postgresql.version>
 		<querydsl.version>4.1.4</querydsl.version>
 		<reactor.version>2.0.8.RELEASE</reactor.version>

From b8591206d5ae0ce0f2b6a90fa5bf9794add96785 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 29 May 2017 11:49:46 +0200
Subject: [PATCH 2/2] Polish

---
 .../boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
index a185883dd6..1d89b40f99 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java
@@ -103,9 +103,7 @@ public class Neo4jPropertiesTests {
 		Neo4jProperties properties = load(true,
 				"spring.data.neo4j.uri=http://user:secret@my-server:7474");
 		Configuration configuration = properties.createConfiguration();
-		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER,
-				"http://my-server:7474");
-		assertCredentials(configuration, "user", "secret");
+		assertDriver(configuration, Neo4jProperties.HTTP_DRIVER, "http://my-server:7474");
 		assertCredentials(configuration, "user", "secret");
 	}