Update SNAPSHOT to 2.0.0-M6

docs/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<packaging>jar</packaging>
 	<name>Spring Cloud Kubernetes Docs</name>

docs/src/main/asciidoc/_configprops.adoc

@@ -51,6 +51,7 @@
 |spring.cloud.kubernetes.config.paths |  | 
 |spring.cloud.kubernetes.config.sources |  | 
 |spring.cloud.kubernetes.discovery.all-namespaces | `false` | If discovering all namespaces.
+|spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `60` | Timeout for initializing discovery cache, will abort the application if exceeded.
 |spring.cloud.kubernetes.discovery.enabled | `true` | If Kubernetes Discovery is enabled.
 |spring.cloud.kubernetes.discovery.filter |  | SpEL expression to filter services AFTER they have been retrieved from the Kubernetes API server.
 |spring.cloud.kubernetes.discovery.known-secure-ports |  | Set the port numbers that are considered secure and use HTTPS.
@@ -64,6 +65,7 @@
 |spring.cloud.kubernetes.discovery.primary-port-name |  | If set then the port with a given name is used as primary when multiple ports are defined for a service.
 |spring.cloud.kubernetes.discovery.service-labels |  | If set, then only the services matching these labels will be fetched from the Kubernetes API server.
 |spring.cloud.kubernetes.discovery.service-name | `unknown` | The service name of the local instance.
+|spring.cloud.kubernetes.discovery.wait-cache-ready | `true` | 
 |spring.cloud.kubernetes.enabled | `true` | Whether to enable Kubernetes integration.
 |spring.cloud.kubernetes.loadbalancer.cluster-domain | `cluster.local` | cluster domain.
 |spring.cloud.kubernetes.loadbalancer.enabled | `true` | Load balancer enabled,default true.

pom.xml

@@ -24,13 +24,13 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-M6</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-kubernetes</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0-M6</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes</name>
 
@@ -63,10 +63,10 @@
 
 	<properties>
 		<!-- Dependency Versions -->
-		<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>3.0.0-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-bus.version>3.0.0-SNAPSHOT</spring-cloud-bus.version>
-		<spring-cloud-contract.version>3.0.0-SNAPSHOT</spring-cloud-contract.version>
+		<spring-cloud-commons.version>3.0.0-M6</spring-cloud-commons.version>
+		<spring-cloud-config.version>3.0.0-M6</spring-cloud-config.version>
+		<spring-cloud-bus.version>3.0.0-M6</spring-cloud-bus.version>
+		<spring-cloud-contract.version>3.0.0-M6</spring-cloud-contract.version>
 
 		<!-- Maven Plugin Versions -->
 		<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>

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

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml

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

spring-cloud-kubernetes-dependencies/pom.xml

@@ -23,11 +23,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>3.0.0-SNAPSHOT</version>
+		<version>3.0.0-M6</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0-M6</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Kubernetes :: Dependencies</name>
 	<description>Spring Cloud Kubernetes Dependencies</description>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>kubernetes-leader-election-example</artifactId>

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/greeting-service/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>kubernetes-loadbalancer-example</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>kubernetes-loadbalancer-example</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-examples</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>kubernetes-loadbalancer-example</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-examples/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-examples</artifactId>

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

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

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

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

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>discovery-client</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>discovery-service-a</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>discovery-service-b</artifactId>

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

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>kubernetes-client-discovery</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>

spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>discovery-parent</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>tests</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Istio</name>

spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-integration-tests/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>

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>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-kubernetes-istio/pom.xml

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

spring-cloud-kubernetes-leader/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-kubernetes</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 
 	<artifactId>spring-cloud-kubernetes-leader</artifactId>

spring-cloud-kubernetes-loadbalancer/pom.xml

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

spring-cloud-kubernetes-test-support/pom.xml

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

spring-cloud-starter-kubernetes-all/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

spring-cloud-starter-kubernetes-client-all/pom.xml

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

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

@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

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

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

spring-cloud-starter-kubernetes/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<artifactId>spring-cloud-kubernetes</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.0.0-SNAPSHOT</version>
+		<version>2.0.0-M6</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>