From 757c6a9619bb01b78568a488ca215457a9f63894 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 3 Jul 2018 13:46:17 +0100
Subject: [PATCH] Upgrade to Mongodb 3.8.0

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

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
index 1c55322eb1..151e183da8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -133,7 +133,8 @@ public class MongoClientFactoryTests {
 	}
 
 	private List<ServerAddress> extractServerAddresses(MongoClient client) {
-		Cluster cluster = (Cluster) ReflectionTestUtils.getField(client, "cluster");
+		Cluster cluster = (Cluster) ReflectionTestUtils
+				.getField(ReflectionTestUtils.getField(client, "delegate"), "cluster");
 		ClusterSettings clusterSettings = (ClusterSettings) ReflectionTestUtils
 				.getField(cluster, "settings");
 		return clusterSettings.getHosts();
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
index 77a9259b0b..a0e94172d8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -159,7 +159,8 @@ public class MongoPropertiesTests {
 	}
 
 	private List<ServerAddress> extractServerAddresses(MongoClient client) {
-		Cluster cluster = (Cluster) ReflectionTestUtils.getField(client, "cluster");
+		Cluster cluster = (Cluster) ReflectionTestUtils
+				.getField(ReflectionTestUtils.getField(client, "delegate"), "cluster");
 		ClusterSettings clusterSettings = (ClusterSettings) ReflectionTestUtils
 				.getField(cluster, "settings");
 		return clusterSettings.getHosts();
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index 73896b9721..52740305d8 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -126,7 +126,7 @@
 		<micrometer.version>1.0.5</micrometer.version>
 		<mockito.version>2.19.0</mockito.version>
 		<mongo-driver-reactivestreams.version>1.9.0-beta1</mongo-driver-reactivestreams.version>
-		<mongodb.version>3.8.0-beta2</mongodb.version>
+		<mongodb.version>3.8.0</mongodb.version>
 		<mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
 		<mysql.version>5.1.46</mysql.version>
 		<narayana.version>5.8.2.Final</narayana.version>