From 73fab14b213f730e2dba1b0c39e6563979e220ba Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@pivotal.io>
Date: Wed, 14 Aug 2019 11:42:14 +0200
Subject: [PATCH] DATAMONGO-2342 - Upgrade MongoDB java & reactive streams
 Driver to 3.11 and 1.12.

Original pull request: #778.
---
 pom.xml                                                       | 4 ++--
 .../data/mongodb/core/ReactiveMongoTemplateIndexTests.java    | 1 -
 .../data/mongodb/test/util/MongoTestUtils.java                | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 08da7a446..bee793c12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,8 +27,8 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
 		<springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons>
-		<mongo>3.11.0-rc0</mongo>
-		<mongo.reactivestreams>1.12.0-rc0</mongo.reactivestreams>
+		<mongo>3.11.0</mongo>
+		<mongo.reactivestreams>1.12.0</mongo.reactivestreams>
 		<jmh.version>1.19</jmh.version>
 	</properties>
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
index bb23fe34c..a2eada0a8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
@@ -32,7 +32,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.annotation.Id;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
index 955a0ef9c..fc4d11d58 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
@@ -118,6 +118,7 @@ public class MongoTestUtils {
 				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
 
 		Mono.from(database.getCollection(collectionName).drop()) //
+				.retryBackoff(3, Duration.ofMillis(250)) //
 				.as(StepVerifier::create) //
 				.expectNext(Success.SUCCESS) //
 				.verifyComplete();