Merge branch 'main' into fabric8-leader-election

Author: wind57

.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/maven-build-with-dry-run-for-tests/action.yaml

@@ -15,7 +15,9 @@ runs:
     - name: find all classpath entries
       shell: bash
       run: |
-        ./mvnw -q exec:exec -Dexec.classpathScope="test" -Dexec.executable="echo" -Dexec.args="%classpath" | tr : "\n" > /tmp/deps.txt
+        # skip 'spring-cloud-kubernetes-controllers' project since we do not want to run tests from it.
+        # we already do that in the 'build-controllers-project/action.yaml', that happens before this step
+        ./mvnw -q exec:exec -Dexec.classpathScope="test" -Dexec.executable="echo" -Dexec.args="%classpath" | tr : "\n" | grep -v spring-cloud-kubernetes-controllers > /tmp/deps.txt
 
     - name: find all tests
       shell: bash

.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>

docs/modules/ROOT/pages/property-source-config/configmap-propertysource.adoc

@@ -1,7 +1,7 @@
 [[configmap-propertysource]]
 = Using a `ConfigMap` `PropertySource`
 
-Kubernetes provides a resource named https://kubernetes.io/docs/user-guide/configmap/[`ConfigMap`] to externalize the
+Kubernetes provides a resource named https://kubernetes.io/docs/concepts/configuration/configmap/[`ConfigMap`] to externalize the
 parameters to pass to your application in the form of key-value pairs or embedded `application.properties` or `application.yaml` files.
 The link:https://github.com/spring-cloud/spring-cloud-kubernetes/tree/main/spring-cloud-kubernetes-fabric8-config[Spring Cloud Kubernetes Config] project makes Kubernetes `ConfigMap` instances available
 during application startup and triggers hot reloading of beans or Spring context when changes are detected on

docs/package.json

@@ -4,7 +4,7 @@
 		"@antora/atlas-extension": "1.0.0-alpha.2",
 		"@antora/collector-extension": "1.0.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
-		"@springio/antora-extensions": "1.14.4",
+		"@springio/antora-extensions": "1.14.6",
 		"@springio/asciidoctor-extensions": "1.0.0-alpha.17"
 	}
 }

pom.xml

@@ -33,6 +33,7 @@
 	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
+	<description>Spring Cloud Kubernetes</description>
 
 	<url>https://cloud.spring.io</url>
 	<inceptionYear>2017</inceptionYear>
@@ -49,7 +50,28 @@
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
-
+	<developers>
+		<developer>
+			<id>sgibb</id>
+			<name>Spencer Gibb</name>
+			<email>spencer.gibb at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>lead</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>rbaxter</id>
+			<name>Ryan Baxter</name>
+			<email>ryan.baxter at broadcom.com</email>
+			<organization>Broadcom, Inc.</organization>
+			<organizationUrl>https://www.spring.io</organizationUrl>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-kubernetes</url>
 		<connection>
@@ -229,6 +251,23 @@
 	</reporting>
 
 	<profiles>
+		<profile>
+			<id>central</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<configuration>
+							<excludeArtifacts>
+								<artifact>spring-cloud-kubernetes-examples</artifact>
+								<artifact>spring-cloud-kubernetes-integration-tests</artifact>
+							</excludeArtifacts>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>spring</id>
 			<repositories>
@@ -298,7 +337,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-enforcer-plugin</artifactId>
-						<version>1.4.1</version>
+						<version>3.6.1</version>
 						<executions>
 							<execution>
 								<id>enforce-no-snapshots</id>

spring-cloud-kubernetes-client-autoconfig/pom.xml

@@ -10,6 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-kubernetes-client-autoconfig</artifactId>
+	<name>${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>
@@ -29,6 +30,11 @@
 			<artifactId>spring-boot-actuator-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-health</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure</artifactId>

spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientActuatorConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 
 import io.kubernetes.client.openapi.models.V1Pod;
 
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
+import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator;
 import org.springframework.cloud.kubernetes.commons.PodUtils;
 import org.springframework.cloud.kubernetes.commons.autoconfig.ConditionalOnKubernetesHealthIndicatorEnabled;
 import org.springframework.context.annotation.Bean;