Merge branch '3.1.x'

Author: ryanjbaxter

.github/workflows/maven.yaml

@@ -35,7 +35,7 @@ jobs:
       - name: setup project jdk-17
         id: jdk_17
         uses: ./.github/workflows/composites/setup-jdk17
-        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
+        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
 
       - name: cache local maven repository
         uses: ./.github/workflows/composites/cache
@@ -115,7 +115,7 @@ jobs:
 
       - name: setup project jdk-17
         uses: ./.github/workflows/composites/setup-jdk17
-        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
+        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
 
       - name: pre-test-actions
         uses: ./.github/workflows/composites/pre-test-actions
@@ -159,7 +159,7 @@ jobs:
 
       - name: setup project jdk-17
         uses: ./.github/workflows/composites/setup-jdk17
-        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
+        if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
 
       - name: pre-test-actions
         uses: ./.github/workflows/composites/pre-test-actions

spring-cloud-kubernetes-fabric8-config/src/test/java/org/springframework/cloud/kubernetes/fabric8/config/EventBasedConfigurationChangeDetectorTests.java

@@ -45,7 +45,7 @@
  */
 class EventBasedConfigurationChangeDetectorTests {
 
-	@SuppressWarnings({ "unchecked", "raw" })
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Test
 	void verifyConfigChangesAccountsForBootstrapPropertySources() {
 		MockEnvironment env = new MockEnvironment();

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

@@ -18,7 +18,7 @@
 	<properties>
 		<java.version>17</java.version>
 		<docker-java.version>3.2.13</docker-java.version>
-		<testcontainers.version>1.18.0</testcontainers.version>
+		<testcontainers.version>1.18.3</testcontainers.version>
 	</properties>
 
 	<build>

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

@@ -13,7 +13,7 @@
 
 	<properties>
 		<awaitility.version>4.0.3</awaitility.version>
-		<testcontainers.version>1.19.0</testcontainers.version>
+		<testcontainers.version>1.18.3</testcontainers.version>
 	</properties>
 	<dependencies>
 
@@ -61,7 +61,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>exec-maven-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>3.1.1</version>
 						<executions>
 							<execution>
 								<goals>