Skip to content

Commit 08a0712

Browse files
committed
Update SNAPSHOT to 2.0.0-M6
1 parent c0e154f commit 08a0712

File tree

43 files changed

+50
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+50
-48
lines changed

docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.cloud</groupId>
1010
<artifactId>spring-cloud-kubernetes</artifactId>
11-
<version>2.0.0-SNAPSHOT</version>
11+
<version>2.0.0-M6</version>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<name>Spring Cloud Kubernetes Docs</name>

docs/src/main/asciidoc/_configprops.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
|spring.cloud.kubernetes.config.paths | |
5252
|spring.cloud.kubernetes.config.sources | |
5353
|spring.cloud.kubernetes.discovery.all-namespaces | `false` | If discovering all namespaces.
54+
|spring.cloud.kubernetes.discovery.cache-loading-timeout-seconds | `60` | Timeout for initializing discovery cache, will abort the application if exceeded.
5455
|spring.cloud.kubernetes.discovery.enabled | `true` | If Kubernetes Discovery is enabled.
5556
|spring.cloud.kubernetes.discovery.filter | | SpEL expression to filter services AFTER they have been retrieved from the Kubernetes API server.
5657
|spring.cloud.kubernetes.discovery.known-secure-ports | | Set the port numbers that are considered secure and use HTTPS.
@@ -64,6 +65,7 @@
6465
|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.
6566
|spring.cloud.kubernetes.discovery.service-labels | | If set, then only the services matching these labels will be fetched from the Kubernetes API server.
6667
|spring.cloud.kubernetes.discovery.service-name | `unknown` | The service name of the local instance.
68+
|spring.cloud.kubernetes.discovery.wait-cache-ready | `true` |
6769
|spring.cloud.kubernetes.enabled | `true` | Whether to enable Kubernetes integration.
6870
|spring.cloud.kubernetes.loadbalancer.cluster-domain | `cluster.local` | cluster domain.
6971
|spring.cloud.kubernetes.loadbalancer.enabled | `true` | Load balancer enabled,default true.

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<parent>
2525
<groupId>org.springframework.cloud</groupId>
2626
<artifactId>spring-cloud-build</artifactId>
27-
<version>3.0.0-SNAPSHOT</version>
27+
<version>3.0.0-M6</version>
2828
<relativePath/>
2929
</parent>
3030

3131
<groupId>org.springframework.cloud</groupId>
3232
<artifactId>spring-cloud-kubernetes</artifactId>
33-
<version>2.0.0-SNAPSHOT</version>
33+
<version>2.0.0-M6</version>
3434
<packaging>pom</packaging>
3535
<name>Spring Cloud Kubernetes</name>
3636

@@ -63,10 +63,10 @@
6363

6464
<properties>
6565
<!-- Dependency Versions -->
66-
<spring-cloud-commons.version>3.0.0-SNAPSHOT</spring-cloud-commons.version>
67-
<spring-cloud-config.version>3.0.0-SNAPSHOT</spring-cloud-config.version>
68-
<spring-cloud-bus.version>3.0.0-SNAPSHOT</spring-cloud-bus.version>
69-
<spring-cloud-contract.version>3.0.0-SNAPSHOT</spring-cloud-contract.version>
66+
<spring-cloud-commons.version>3.0.0-M6</spring-cloud-commons.version>
67+
<spring-cloud-config.version>3.0.0-M6</spring-cloud-config.version>
68+
<spring-cloud-bus.version>3.0.0-M6</spring-cloud-bus.version>
69+
<spring-cloud-contract.version>3.0.0-M6</spring-cloud-contract.version>
7070

7171
<!-- Maven Plugin Versions -->
7272
<maven-compiler-plugin.version>3.5</maven-compiler-plugin.version>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-commons/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-controllers/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>pom</packaging>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-controllers</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<parent>
2424
<artifactId>spring-cloud-dependencies-parent</artifactId>
2525
<groupId>org.springframework.cloud</groupId>
26-
<version>3.0.0-SNAPSHOT</version>
26+
<version>3.0.0-M6</version>
2727
<relativePath/>
2828
</parent>
2929
<artifactId>spring-cloud-kubernetes-dependencies</artifactId>
30-
<version>2.0.0-SNAPSHOT</version>
30+
<version>2.0.0-M6</version>
3131
<packaging>pom</packaging>
3232
<name>Spring Cloud Kubernetes :: Dependencies</name>
3333
<description>Spring Cloud Kubernetes Dependencies</description>

spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-examples</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-kubernetes-examples</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>2.0.0-M6</version>
1010
</parent>
1111

1212
<artifactId>kubernetes-leader-election-example</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>kubernetes-loadbalancer-example</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>kubernetes-loadbalancer-example</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-examples</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>kubernetes-loadbalancer-example</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes-examples</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>2.0.0-SNAPSHOT</version>
25+
<version>2.0.0-M6</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

spring-cloud-kubernetes-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
2525
<groupId>org.springframework.cloud</groupId>
26-
<version>2.0.0-SNAPSHOT</version>
26+
<version>2.0.0-M6</version>
2727
</parent>
2828

2929
<artifactId>spring-cloud-kubernetes-examples</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>2.0.0-SNAPSHOT</version>
25+
<version>2.0.0-M6</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>2.0.0-SNAPSHOT</version>
25+
<version>2.0.0-M6</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<artifactId>discovery-client</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<artifactId>discovery-service-a</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<artifactId>discovery-service-b</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<artifactId>kubernetes-client-discovery</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Discovery Parent</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>discovery-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<artifactId>tests</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Istio</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-kubernetes</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>2.0.0-M6</version>
1010
</parent>
1111

1212
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Configmap</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.cloud</groupId>
99
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-M6</version>
1111
</parent>
1212

1313
<name>Spring Cloud Kubernetes :: Integration Tests :: Simple Core</name>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes-integration-tests</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-istio/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

spring-cloud-kubernetes-leader/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.springframework.cloud</groupId>
2424
<artifactId>spring-cloud-kubernetes</artifactId>
25-
<version>2.0.0-SNAPSHOT</version>
25+
<version>2.0.0-M6</version>
2626
</parent>
2727

2828
<artifactId>spring-cloud-kubernetes-leader</artifactId>

spring-cloud-kubernetes-loadbalancer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-kubernetes</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>spring-cloud-kubernetes</artifactId>
2424
<groupId>org.springframework.cloud</groupId>
25-
<version>2.0.0-SNAPSHOT</version>
25+
<version>2.0.0-M6</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>spring-cloud-kubernetes</artifactId>
77
<groupId>org.springframework.cloud</groupId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>2.0.0-M6</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)