Merge branch '3.1.x' into refactor_fabric8_client_discovery

Author: wind57

spring-cloud-kubernetes-fabric8-leader/src/test/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderInitiatorTest.java

@@ -77,15 +77,9 @@ void shouldStart() {
 		assertThat(leaderInitiator.isRunning()).isTrue();
 		verify(mockFabric8LeaderRecordWatcher).start();
 		verify(mockFabric8PodReadinessWatcher).start();
-		boolean[] updateCalled = new boolean[1];
-		Mockito.doAnswer(x -> {
-			updateCalled[0] = true;
-			return null;
-		}).when(mockFabric8LeadershipController).update();
 
-		Awaitility.await().atMost(Duration.ofSeconds(3)).until(() -> updateCalled[0]);
+		Awaitility.await().untilAsserted(() -> verify(mockFabric8LeadershipController, atLeastOnce()).update());
 
-		verify(mockFabric8LeadershipController, atLeastOnce()).update();
 	}
 
 	@Test

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml

@@ -36,16 +36,4 @@
 		</dependency>
 
 	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>../src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-	</build>
 </project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml

@@ -44,17 +44,5 @@
 		</dependency>
 
 	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>../src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
-	</build>
 
 </project>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/pom.xml

@@ -31,16 +31,13 @@
 		</dependency>
 
 	</dependencies>
+
 	<build>
 		<resources>
 			<resource>
 				<directory>../src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
 		</resources>
 	</build>