Merge branch 'main' into fabric8-leader-election

Author: wind57

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

@@ -475,9 +475,9 @@ spring:
 
 The same processing rules apply when generating property source as for config maps. The only difference is that
 potentially, looking up secrets by labels can mean that we find more than one source. In such a case, prefix (if specified via `useNameAsPrefix`)
-will be the names of all secrets found for those particular labels.
+will be the name of the secret found for those particular labels.
 
-One more thing to bear in mind is that we support `prefix` per _source_, not per secret. The easiest way to explain this is via an example:
+One more thing to bear in mind is that we support `prefix` per _secret_. The easiest way to explain this is via an example:
 
 [source.yaml]
 ----
@@ -496,14 +496,11 @@ spring:
             useNameAsPrefix: true
 ----
 
-Suppose that a query matching such a label will provide two secrets as a result: `secret-a` and `secret-b`.
-Both of these secrets have the same property name: `color=sea-blue` and `color=ocean-blue`. It is undefined which
-`color` will end-up as part of property sources, but the prefix for it will be `secret-a.secret-b`
-(concatenated sorted naturally, names of the secrets).
-
-If you need more fine-grained results, adding more labels to identify the secret uniquely would be an option.
-
+Suppose that a query matching such a label will return two secrets as a result: `secretA` and `secretB`.
+Both of these secrets have the same property name: `color=sea-blue` and `color=ocean-blue`. Because `useNamesAsPrefix=true`, there will be two property sources loaded:
 
+ - `secretA.color=sea-blue`
+ - `secretB.color=ocean-blue`
 
 By default, besides reading the config map that is specified in the `sources` configuration, Spring will also try to read
 all properties from "profile aware" sources. The easiest way to explain this is via an example. Let's suppose your application

docs/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<packaging>jar</packaging>

pom.xml

@@ -25,12 +25,12 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.3.0-SNAPSHOT</version>
+		<version>4.3.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -70,10 +70,10 @@
 		<failsafe-reports-directory>failsafe-reports</failsafe-reports-directory>
 		<!-- Dependency Versions -->
 		<mockito-inline.version>4.8.1</mockito-inline.version>
-		<spring-cloud-commons.version>4.3.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.3.0-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>4.3.0-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>4.3.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>4.3.1-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-config.version>4.3.1-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-bus.version>4.3.1-SNAPSHOT</spring-cloud-bus.version>
+		<spring-cloud-contract.version>4.3.1-SNAPSHOT</spring-cloud-contract.version>
 
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failsOnViolation>true

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

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

@@ -6,7 +6,7 @@
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
 
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-commons/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-controllers/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-controllers</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.3.0-SNAPSHOT</version>
+		<version>3.3.1-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>