Merge branch '3.2.x'

spring-cloud · Jan 24, 2025 · 3e58229 · 3e58229
2 parents 2c0dd9a + ad04de8
commit 3e58229
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/.../java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java b/.../java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java
@@ -60,6 +60,7 @@ void beforeEach() {
 	@AfterEach
 	void afterEach() {
 		leaderInitiator.stop();
+		Mockito.reset(mockFabric8LeadershipController, mockFabric8LeaderRecordWatcher, mockFabric8PodReadinessWatcher);
 	}
 
 	@Test

diff --git a/...d-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml b/...d-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/pom.xml
@@ -42,6 +42,22 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
+
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>build-image</id>
+						<configuration>
+							<skip>true</skip>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+
 	</build>