From ab7f6654d80e130275231271ca4582d60cf99988 Mon Sep 17 00:00:00 2001
From: Frank Pavageau <fpavageau@ekino.com>
Date: Tue, 17 Apr 2018 23:43:38 +0200
Subject: [PATCH] Manage the Mockito/JUnit 5 dependency

This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.

Closes gh-12890
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index e2bde6b2dc..046240509c 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -123,7 +123,7 @@
 		<lombok.version>1.16.20</lombok.version>
 		<mariadb.version>2.2.3</mariadb.version>
 		<micrometer.version>1.0.4</micrometer.version>
-		<mockito.version>2.15.0</mockito.version>
+		<mockito.version>2.18.3</mockito.version>
 		<mongo-driver-reactivestreams.version>1.7.1</mongo-driver-reactivestreams.version>
 		<mongodb.version>3.6.3</mongodb.version>
 		<mssql-jdbc.version>6.2.2.jre8</mssql-jdbc.version>
@@ -2303,6 +2303,11 @@
 				<artifactId>mockito-inline</artifactId>
 				<version>${mockito.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-junit-jupiter</artifactId>
+				<version>${mockito.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.mongodb</groupId>
 				<artifactId>bson</artifactId>