From 660b0fad00a3b95ae2440283901b48b46fd2fbea Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 18 Sep 2017 19:17:43 +0100
Subject: [PATCH] Upgrade to Mongodb 3.5.0

Closes gh-10333
---
 .../boot/autoconfigure/mongo/MongoPropertiesTests.java         | 3 ++-
 spring-boot-dependencies/pom.xml                               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
index b5bd341265..39b3b9a47d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
@@ -49,6 +49,7 @@ public class MongoPropertiesTests {
 	}
 
 	@Test
+	@SuppressWarnings("deprecation")
 	public void allMongoClientOptionsCanBeSet() {
 		MongoClientOptions.Builder builder = MongoClientOptions.builder();
 		builder.alwaysUseMBeans(true);
@@ -57,7 +58,7 @@ public class MongoPropertiesTests {
 		builder.cursorFinalizerEnabled(false);
 		builder.description("test");
 		builder.maxWaitTime(120001);
-		builder.socketKeepAlive(true);
+		builder.socketKeepAlive(false);
 		builder.socketTimeout(1000);
 		builder.threadsAllowedToBlockForConnectionMultiplier(6);
 		builder.minConnectionsPerHost(0);
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 86135d1cb0..ed19875ff3 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -136,7 +136,7 @@
 		<mssql-jdbc.version>6.2.1.jre8</mssql-jdbc.version>
 		<mockito.version>2.9.0</mockito.version>
 		<mongo-driver-reactivestreams.version>1.5.0</mongo-driver-reactivestreams.version>
-		<mongodb.version>3.4.3</mongodb.version>
+		<mongodb.version>3.5.0</mongodb.version>
 		<mysql.version>5.1.44</mysql.version>
 		<narayana.version>5.6.4.Final</narayana.version>
 		<nekohtml.version>1.9.22</nekohtml.version>