From 0510e0eb5cbdd47edd7da911daf970e5627b8872 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Thu, 27 Apr 2023 12:23:57 -0400
Subject: [PATCH] Add mockito bom dependency for compatibility with Boot 3.1.x

---
 spring-cloud-kubernetes-dependencies/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 8569009a..93f78912 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -38,6 +38,7 @@
 		<wiremock.version>2.26.3</wiremock.version>
 		<spring-retry.version>1.3.1</spring-retry.version>
 		<commons.collections4.version>4.4</commons.collections4.version>
+		<mockito-inline.version>4.8.1</mockito-inline.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -233,6 +234,20 @@
 				<scope>test</scope>
 			</dependency>
 
+			<!--Spring Boot 3.1 uses Mockito 5.x.  Mockito 5.x has removed support for mockito-inline.-->
+			<!--https://github.com/mockito/mockito/issues/2877-->
+			<!--We need to support both Boot 3.0.x and Boot 3.1.x with Spring Cloud K8s 3.0.x-->
+			<!--To maintain compatibility we manage the version ourselves-->
+			<!-- TODO Remove this and all references to mockito-inline in the next major -->
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-bom</artifactId>
+				<version>${mockito-inline.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+
 		</dependencies>
 	</dependencyManagement>
 	<profiles>