Merge branch '3.1.x'

Author: ryanjbaxter

pom.xml

@@ -19,7 +19,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xmlns="http://maven.apache.org/POM/4.0.0"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-		 
+
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -155,19 +155,6 @@
 				<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>

spring-cloud-kubernetes-client-autoconfig/pom.xml

@@ -51,7 +51,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-client-config/pom.xml

@@ -106,7 +106,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-client-loadbalancer/pom.xml

@@ -45,7 +45,7 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 

spring-cloud-kubernetes-commons/pom.xml

@@ -99,7 +99,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml

@@ -33,13 +33,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
-			<!-- in favor of mockito-inline -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -49,7 +42,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml

@@ -42,13 +42,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<!-- In favor of mockito-inline -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.wiremock</groupId>
@@ -68,7 +61,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-fabric8-autoconfig/pom.xml

@@ -84,13 +84,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
-			<!-- in favor of mockito-inline -->
-			<exclusions>
-				<exclusion>
-					<groupId>org.mockito</groupId>
-					<artifactId>mockito-core</artifactId>
-				</exclusion>
-			</exclusions>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -122,7 +115,7 @@
 
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-inline</artifactId>
+			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/locator_retry/config_retry_enabled/ConfigDataConfigRetryEnabledTests.java

@@ -19,8 +19,11 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.mockito.Mockito;
+import org.mockito.internal.util.MockUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -56,8 +59,20 @@ static void setup() {
 	@BeforeEach
 	void beforeEach() {
 		psl = propertySourceLocator;
-		verifiablePsl = spy(propertySourceLocator.getConfigMapPropertySourceLocator());
-		propertySourceLocator.setConfigMapPropertySourceLocator(verifiablePsl);
+		// latest Mockito does not allow to do something like Mockito.spy(spy)
+		// so this works around that
+		if (!MockUtil.isSpy(propertySourceLocator.getConfigMapPropertySourceLocator())) {
+			verifiablePsl = spy(propertySourceLocator.getConfigMapPropertySourceLocator());
+			propertySourceLocator.setConfigMapPropertySourceLocator(verifiablePsl);
+		}
+		else {
+			verifiablePsl = propertySourceLocator.getConfigMapPropertySourceLocator();
+		}
+	}
+
+	@AfterEach
+	void afterEach() {
+		Mockito.reset(verifiablePsl);
 	}
 
 }

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/retry/secrets_enabled/BootstrapSecretsRetryEnabledTests.java

@@ -43,7 +43,7 @@ static void setup() {
 	private Fabric8SecretsPropertySourceLocator propertySourceLocator;
 
 	@BeforeEach
-	public void beforeEach() {
+	void beforeEach() {
 		psl = propertySourceLocator;
 		verifiablePsl = propertySourceLocator;
 	}