From e7c26bf76c15677150d56dd7c4fa5fad91388138 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Fri, 2 Jun 2023 11:32:17 -0400
Subject: [PATCH] Moves mockito dependency mgmt to root pom.xml

Fixes gh-1355
---
 pom.xml                                      | 14 ++++++++++++++
 spring-cloud-kubernetes-dependencies/pom.xml | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a8e7f330..ba0345cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@
 
 	<properties>
 		<!-- Dependency Versions -->
+		<mockito-inline.version>4.8.1</mockito-inline.version>
 		<spring-cloud-commons.version>4.0.4-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-config.version>4.0.4-SNAPSHOT</spring-cloud-config.version>
 		<spring-cloud-bus.version>4.0.3-SNAPSHOT</spring-cloud-bus.version>
@@ -150,6 +151,19 @@
 				<scope>import</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 minor -->
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-bom</artifactId>
+				<version>${mockito-inline.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-all</artifactId>
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 42c88c53..b209f246 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -37,7 +37,6 @@
 		<kubernetes-native-client.version>17.0.2</kubernetes-native-client.version>
 		<wiremock.version>2.26.3</wiremock.version>
 		<commons.collections4.version>4.4</commons.collections4.version>
-		<mockito-inline.version>4.8.1</mockito-inline.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -227,20 +226,6 @@
 				<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>