Merge branch '3.1.x' into 3.2.x

Author: ryanjbaxter

.github/workflows/composites/clean-space/action.yaml

@@ -4,6 +4,12 @@ runs:
   using: "composite"
   steps:
 
+    - name: Disable man-db to make package install and removal faster
+      shell: bash
+      run: |
+        echo 'set man-db/auto-update false' | sudo debconf-communicate >/dev/null
+        sudo dpkg-reconfigure man-db 
+
     - name: Free Disk Space
       uses: jlumbroso/free-disk-space@main
       with:

.github/workflows/composites/run-and-save-test-times-when-cache-missing/action.yaml

@@ -46,7 +46,9 @@ runs:
             -Dhttp.keepAlive=false \
             -Dmaven.wagon.http.pool=false \
             -Dmaven.wagon.http.retryHandler.class=standard \
+            -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
             -Dmaven.wagon.http.retryHandler.count=3 \
+            -Dmaven.resolver.transport=wagon \
             -Dspring-boot.build-image.skip=true          
         
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.github/workflows/composites/run-and-save-test-times-when-cache-present/action.yaml

@@ -155,7 +155,9 @@ runs:
               -Dhttp.keepAlive=false \
               -Dmaven.wagon.http.pool=false \
               -Dmaven.wagon.http.retryHandler.class=standard \
+              -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
               -Dmaven.wagon.http.retryHandler.count=3 \
+              -Dmaven.resolver.transport=wagon \
               -Dspring-boot.build-image.skip=true
 
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt

.settings.xml

@@ -46,6 +46,10 @@
 				</repository>
 			</repositories>
 			<pluginRepositories>
+				<pluginRepository>
+					<id>central</id>
+					<url>https://repo1.maven.org/maven2/</url>
+				</pluginRepository>
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>

spring-cloud-kubernetes-commons/pom.xml

@@ -11,18 +11,6 @@
 
 	<artifactId>spring-cloud-kubernetes-commons</artifactId>
 	<name>${project.artifactId}</name>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <dependencies>
 		<dependency>

spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml

@@ -11,8 +11,7 @@
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
 	<name>Spring Cloud Kubernetes :: Examples :: Leader Election</name>
-	<description>Leader election demonstration with Spring Integration and ConfigMap
-	</description>
+	<description>Leader election demonstration with Spring Integration and ConfigMap</description>
 
 	<dependencyManagement>
 		<dependencies>
@@ -73,14 +72,6 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.5.3</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.5.3</version>
-			</plugin>
 		</plugins>
 	</build>