Update SNAPSHOT to 1.0.2.RELEASE

spring-builds · spring-builds · commit e529dc94c20f · 2019-06-20T17:01:52.000Z
diff --git a/README.adoc b/README.adoc
@@ -324,6 +324,59 @@ However, if the `production` profile is active, the configuration becomes:
 
 If both profiles are active, the property that appears last within the `ConfigMap` overwrites any preceding values.
 
+Another option is to create a different config map per profile and spring boot will automatically fetch it based
+on active profiles
+
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: demo
+data:
+  application.yml: |-
+    greeting:
+      message: Say Hello to the World
+    farewell:
+      message: Say Goodbye
+----
+====
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: demo-development
+data:
+  application.yml: |-
+    spring:
+      profiles: development
+    greeting:
+      message: Say Hello to the Developers
+    farewell:
+      message: Say Goodbye to the Developers
+----
+====
+====
+[source,yaml]
+----
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: demo-production
+data:
+  application.yml: |-
+    spring:
+      profiles: production
+    greeting:
+      message: Say Hello to the Ops
+    farewell:
+      message: Say Goodbye
+----
+====
+
 
 To tell Spring Boot which `profile` should be enabled at bootstrap, you can pass a system property to the Java
 command. To do so, you can launch your Spring Boot application with an environment variable that you can define with the OpenShift
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes Docs</name>
diff --git a/pom.xml b/pom.xml
@@ -24,13 +24,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.4.BUILD-SNAPSHOT</version>
+		<version>2.1.5.RELEASE</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>1.0.2.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -63,9 +63,9 @@
 
 	<properties>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-netflix.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-config.version>2.1.2.BUILD-SNAPSHOT</spring-cloud-config.version>
+		<spring-cloud-commons.version>2.1.2.RELEASE</spring-cloud-commons.version>
+		<spring-cloud-netflix.version>2.1.2.RELEASE</spring-cloud-netflix.version>
+		<spring-cloud-config.version>2.1.3.RELEASE</spring-cloud-config.version>
 
 		<!-- Maven Plugin Versions -->
 		<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>
diff --git a/spring-cloud-kubernetes-config/pom.xml b/spring-cloud-kubernetes-config/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java b/spring-cloud-kubernetes-config/src/main/java/org/springframework/cloud/kubernetes/config/ConfigMapPropertySource.java
@@ -99,16 +99,18 @@ private static Map<String, String> getData(KubernetesClient client, String name,
 			}
 
 			if (environment != null) {
-				for (String activeProfile:environment.getActiveProfiles()) {
+				for (String activeProfile : environment.getActiveProfiles()) {
 
 					String mapNameWithProfile = name + "-" + activeProfile;
 
 					ConfigMap mapWithProfile = StringUtils.isEmpty(namespace)
-						? client.configMaps().withName(mapNameWithProfile).get()
-						: client.configMaps().inNamespace(namespace).withName(mapNameWithProfile).get();
+							? client.configMaps().withName(mapNameWithProfile).get()
+							: client.configMaps().inNamespace(namespace)
+									.withName(mapNameWithProfile).get();
 
 					if (mapWithProfile != null) {
-						result.putAll(processAllEntries(mapWithProfile.getData(), environment));
+						result.putAll(
+								processAllEntries(mapWithProfile.getData(), environment));
 					}
 
 				}
@@ -125,7 +127,6 @@ private static Map<String, String> getData(KubernetesClient client, String name,
 		return new HashMap<>();
 	}
 
-
 	private static Map<String, String> processAllEntries(Map<String, String> input,
 			Environment environment) {
 
diff --git a/spring-cloud-kubernetes-core/pom.xml b/spring-cloud-kubernetes-core/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.4.BUILD-SNAPSHOT</version>
+		<version>2.1.5.RELEASE</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>1.0.3.BUILD-SNAPSHOT</version>
+	<version>1.0.2.RELEASE</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>
diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/greeting-service/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>greeting-service</artifactId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/name-service/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>kubernetes-circuitbreaker-ribbon-example</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>name-service</artifactId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-circuitbreaker-ribbon-example/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>
diff --git a/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-zipkin-example/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-examples/pom.xml b/spring-cloud-kubernetes-examples/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>discovery-client</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>discovery-service-a</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>discovery-service-b</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>
diff --git a/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml b/spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/istio/pom.xml b/spring-cloud-kubernetes-integration-tests/istio/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Istio</name>
diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
diff --git a/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>
diff --git a/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>
diff --git a/spring-cloud-kubernetes-istio/pom.xml b/spring-cloud-kubernetes-istio/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-kubernetes-leader/pom.xml b/spring-cloud-kubernetes-leader/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-leader</artifactId>
diff --git a/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java b/spring-cloud-kubernetes-leader/src/main/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfiguration.java
@@ -41,8 +41,7 @@
 @Configuration
 @EnableConfigurationProperties(LeaderProperties.class)
 @ConditionalOnBean(KubernetesClient.class)
-@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled",
-		matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", matchIfMissing = true)
 public class LeaderAutoConfiguration {
 
 	@Bean
diff --git a/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java b/spring-cloud-kubernetes-leader/src/test/java/org/springframework/cloud/kubernetes/leader/LeaderAutoConfigurationTests.java
@@ -33,8 +33,7 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
 		// Make sure test passes without Kubernetes cluster
-		"spring.cloud.kubernetes.leader.autoStartup=false"
-})
+		"spring.cloud.kubernetes.leader.autoStartup=false" })
 public class LeaderAutoConfigurationTests {
 
 	@Value("${local.server.port}")
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-all/pom.xml b/spring-cloud-starter-kubernetes-all/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-config/pom.xml b/spring-cloud-starter-kubernetes-config/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes-ribbon/pom.xml b/spring-cloud-starter-kubernetes-ribbon/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.0.3.BUILD-SNAPSHOT</version>
+		<version>1.0.2.RELEASE</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-cloud-starter-kubernetes/pom.xml b/spring-cloud-starter-kubernetes/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -99,16 +99,18 @@ private static Map<String, String> getData(KubernetesClient client, String name,`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if (environment != null) {`
`102`		`- for (String activeProfile:environment.getActiveProfiles()) {`
	`102`	`+ for (String activeProfile : environment.getActiveProfiles()) {`
`103`	`103`
`104`	`104`	`String mapNameWithProfile = name + "-" + activeProfile;`
`105`	`105`
`106`	`106`	`ConfigMap mapWithProfile = StringUtils.isEmpty(namespace)`
`107`		`- ? client.configMaps().withName(mapNameWithProfile).get()`
`108`		`- : client.configMaps().inNamespace(namespace).withName(mapNameWithProfile).get();`
	`107`	`+ ? client.configMaps().withName(mapNameWithProfile).get()`
	`108`	`+ : client.configMaps().inNamespace(namespace)`
	`109`	`+ .withName(mapNameWithProfile).get();`
`109`	`110`
`110`	`111`	`if (mapWithProfile != null) {`
`111`		`- result.putAll(processAllEntries(mapWithProfile.getData(), environment));`
	`112`	`+ result.putAll(`
	`113`	`+ processAllEntries(mapWithProfile.getData(), environment));`
`112`	`114`	`}`
`113`	`115`
`114`	`116`	`}`
`@@ -125,7 +127,6 @@ private static Map<String, String> getData(KubernetesClient client, String name,`
`125`	`127`	`return new HashMap<>();`
`126`	`128`	`}`
`127`	`129`
`128`		`-`
`129`	`130`	`private static Map<String, String> processAllEntries(Map<String, String> input,`
`130`	`131`	`Environment environment) {`
`131`	`132`