Merge branch '3.1.x'

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -15,12 +15,6 @@
 	<name>Spring Cloud Kubernetes :: Integration Tests</name>
 	<description>Integration tests where SCK applications are run inside a Kubernetes cluster</description>
 
-	<properties>
-		<java.version>17</java.version>
-		<docker-java.version>3.2.13</docker-java.version>
-		<testcontainers.version>1.18.3</testcontainers.version>
-	</properties>
-
 	<build>
 		<plugins>
 
@@ -93,18 +87,6 @@
 
 	</build>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>k3s</artifactId>
-				<version>${testcontainers.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-
-	</dependencyManagement>
-
 	<modules>
 
 		<!-- catalog-watcher -->

spring-cloud-kubernetes-test-support/pom.xml

@@ -11,10 +11,6 @@
 
 	<artifactId>spring-cloud-kubernetes-test-support</artifactId>
 
-	<properties>
-		<awaitility.version>4.1.1</awaitility.version>
-		<testcontainers.version>1.18.3</testcontainers.version>
-	</properties>
 	<dependencies>
 
 		<dependency>
@@ -38,13 +34,11 @@
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>${awaitility.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>k3s</artifactId>
-			<version>${testcontainers.version}</version>
 		</dependency>
 
 	</dependencies>