Merge branch 'main' into fix-1715-drop-profiles-support

Author: wind57

.github/dependabot.yml

@@ -20,6 +20,7 @@ updates:
       - dependency-name: "*"
         update-types:
           - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: maven
     directory: /
     schedule:
@@ -31,6 +32,17 @@ updates:
         update-types:
           - version-update:semver-major
           - version-update:semver-minor
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: daily
+    target-branch: 3.2.x
+    ignore:
+      # only upgrade by minor or patch
+      - dependency-name: "*"
+        update-types:
+          - version-update:semver-major
+          - version-update:semver-minor
   - package-ecosystem: npm
     target-branch: docs-build
     directory: /
@@ -46,3 +58,8 @@ updates:
     directory: /docs
     schedule:
       interval: weekly
+  - package-ecosystem: npm
+    target-branch: 3.2.x
+    directory: /docs
+    schedule:
+      interval: weekly

.github/workflows/composites/maven-build-with-dry-run-for-tests/action.yaml

@@ -8,7 +8,7 @@ runs:
       shell: bash
       run: |
         ./mvnw install -B  \
-              -Dskip.build.image=true \
+              -Dspring-boot.build-image.skip=true \
               -DskipTests -DskipITs \
               -T 1C -U -q
 

.github/workflows/composites/pre-test-actions/action.yaml

@@ -24,7 +24,7 @@ runs:
     - name: build project
       shell: bash
       run: |
-        ./mvnw clean install -Dskip.build.image=true -DskipITs -DskipTests -T1C -U -B -q  
+        ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project

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

@@ -47,7 +47,7 @@ runs:
             -Dmaven.wagon.http.pool=false \
             -Dmaven.wagon.http.retryHandler.class=standard \
             -Dmaven.wagon.http.retryHandler.count=3 \
-            -Dskip.build.image=true          
+            -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

@@ -156,7 +156,7 @@ runs:
               -Dmaven.wagon.http.pool=false \
               -Dmaven.wagon.http.retryHandler.class=standard \
               -Dmaven.wagon.http.retryHandler.count=3 \
-              -Dskip.build.image=true
+              -Dspring-boot.build-image.skip=true
 
         touch /tmp/test_times_${{ env.CURRENT_INDEX }}.txt
 

docs/package.json

@@ -5,6 +5,6 @@
 		"@antora/collector-extension": "1.0.1",
 		"@asciidoctor/tabs": "1.0.0-beta.6",
 		"@springio/antora-extensions": "1.14.2",
-		"@springio/asciidoctor-extensions": "1.0.0-alpha.14"
+		"@springio/asciidoctor-extensions": "1.0.0-alpha.16"
 	}
 }

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtils.java

@@ -312,10 +312,11 @@ public static <T> void registerSingle(ConfigurableBootstrapContext bootstrapCont
 			String name, ApplicationListener<?> listener) {
 		bootstrapContext.registerIfAbsent(cls, BootstrapRegistry.InstanceSupplier.of(instance));
 		bootstrapContext.addCloseListener(event -> {
-			if (event.getApplicationContext().getBeanFactory().getSingleton(name) == null) {
-				event.getApplicationContext()
-					.getBeanFactory()
-					.registerSingleton(name, event.getBootstrapContext().get(cls));
+
+			T singleton = event.getBootstrapContext().get(cls);
+
+			if (event.getApplicationContext().getBeanFactory().getSingleton(name) == null && singleton != null) {
+				event.getApplicationContext().getBeanFactory().registerSingleton(name, singleton);
 				event.getApplicationContext().addApplicationListener(listener);
 			}
 		});

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/config/KubernetesConfigDataLocationResolver.java

@@ -52,6 +52,8 @@
 public abstract class KubernetesConfigDataLocationResolver
 		implements ConfigDataLocationResolver<KubernetesConfigDataResource>, Ordered {
 
+	private static final Class<KubernetesClientProperties> PROPERTIES_CLASS = KubernetesClientProperties.class;
+
 	private static final boolean RETRY_IS_PRESENT = isPresent("org.springframework.retry.annotation.Retryable", null);
 
 	private final Log log;
@@ -139,8 +141,7 @@ private void registerProperties(ConfigDataLocationResolverContext resolverContex
 			SecretsConfigProperties secretsProperties) {
 
 		ConfigurableBootstrapContext bootstrapContext = resolverContext.getBootstrapContext();
-		registerSingle(bootstrapContext, KubernetesClientProperties.class, clientProperties,
-				"configDataKubernetesClientProperties");
+		registerSingle(bootstrapContext, PROPERTIES_CLASS, clientProperties, "configDataKubernetesClientProperties");
 
 		if (configMapProperties != null) {
 			registerSingle(bootstrapContext, ConfigMapConfigProperties.class, configMapProperties,
@@ -174,15 +175,14 @@ private static PropertyHolder of(ConfigDataLocationResolverContext context) {
 		private static KubernetesClientProperties clientProperties(ConfigDataLocationResolverContext context,
 				String namespace) {
 			KubernetesClientProperties kubernetesClientProperties;
+			ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
 
-			if (context.getBootstrapContext().isRegistered(KubernetesClientProperties.class)) {
-				kubernetesClientProperties = context.getBootstrapContext()
-					.get(KubernetesClientProperties.class)
-					.withNamespace(namespace);
+			if (bootstrapContext.isRegistered(PROPERTIES_CLASS) && bootstrapContext.get(PROPERTIES_CLASS) != null) {
+				kubernetesClientProperties = bootstrapContext.get(PROPERTIES_CLASS).withNamespace(namespace);
 			}
 			else {
 				kubernetesClientProperties = context.getBinder()
-					.bindOrCreate(KubernetesClientProperties.PREFIX, Bindable.of(KubernetesClientProperties.class))
+					.bindOrCreate(KubernetesClientProperties.PREFIX, Bindable.of(PROPERTIES_CLASS))
 					.withNamespace(namespace);
 			}
 

spring-cloud-kubernetes-controllers/pom.xml

@@ -33,9 +33,6 @@
 				<executions>
 					<execution>
 						<id>build-image</id>
-						<configuration>
-							<skip>${skip.build.image}</skip>
-						</configuration>
 						<phase>package</phase>
 						<goals>
 							<goal>build-image-no-fork</goal>

spring-cloud-kubernetes-dependencies/pom.xml

@@ -32,9 +32,9 @@
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
 	<properties>
-		<kubernetes-fabric8-client.version>6.13.4</kubernetes-fabric8-client.version>
+		<kubernetes-fabric8-client.version>6.13.5</kubernetes-fabric8-client.version>
 		<kubernetes-native-client.version>19.0.2</kubernetes-native-client.version>
-		<wiremock.version>3.4.2</wiremock.version>
+		<wiremock.version>3.9.2</wiremock.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>