From c4428f17274ad1292213cc9ac0afc729246dabf0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 9 Apr 2020 22:30:38 +0000 Subject: [PATCH] Update SNAPSHOT to 3.0.0.M1 --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 4 ++++ pom.xml | 16 ++++++++-------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 25 insertions(+), 21 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 9ffb6688..0649d9b5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 824b3992..0ac98584 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -21,6 +21,7 @@ |spring.cloud.consul.discovery.default-query-tag | | Tag to query for in service list if one is not listed in serverListQueryTags. |spring.cloud.consul.discovery.default-zone-metadata-name | zone | Service instance zone comes from metadata. This allows changing the metadata tag name. |spring.cloud.consul.discovery.deregister | true | Disable automatic de-registration of service in consul. +|spring.cloud.consul.discovery.enable-tag-override | | Enable tag override for the registered service. |spring.cloud.consul.discovery.enabled | true | Is service discovery enabled? |spring.cloud.consul.discovery.fail-fast | true | Throw exceptions during service registration if true, otherwise, log warnings (defaults to true). |spring.cloud.consul.discovery.health-check-critical-timeout | | Timeout to deregister services critical for longer than timeout (e.g. 30m). Requires consul version 7.x or higher. @@ -40,9 +41,12 @@ |spring.cloud.consul.discovery.instance-zone | | Service instance zone. |spring.cloud.consul.discovery.ip-address | | IP address to use when accessing service (must also set preferIpAddress to use). |spring.cloud.consul.discovery.lifecycle.enabled | true | +|spring.cloud.consul.discovery.management-enable-tag-override | | Enable tag override for the registered management service. +|spring.cloud.consul.discovery.management-metadata | | Metadata to use when registering management service. |spring.cloud.consul.discovery.management-port | | Port to register the management service under (defaults to management port). |spring.cloud.consul.discovery.management-suffix | management | Suffix to use when registering management service. |spring.cloud.consul.discovery.management-tags | | Tags to use when registering management service. +|spring.cloud.consul.discovery.metadata | | Metadata to use when registering service. |spring.cloud.consul.discovery.order | 0 | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. |spring.cloud.consul.discovery.port | | Port to register the service under (defaults to listening port). |spring.cloud.consul.discovery.prefer-agent-address | false | Source of how we will determine the address to use. diff --git a/pom.xml b/pom.xml index e6c74b98..17ef04f4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 pom Spring Cloud Consul Spring Cloud Consul @@ -14,19 +14,19 @@ org.springframework.cloud spring-cloud-build - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 - 3.0.0.BUILD-SNAPSHOT - 3.0.0.BUILD-SNAPSHOT - 3.0.0.BUILD-SNAPSHOT - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 + 3.0.0.M1 + 3.0.0.M1 + 3.0.0.M1 1.0.3.RELEASE - 3.0.0.BUILD-SNAPSHOT - Horsham.BUILD-SNAPSHOT + 3.0.0.M1 + 3.1.0.M1 diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index c54f9bf7..14f08333 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 0995baf6..decae4a3 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 5c79a192..1257c11a 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 8d76820d..72c10593 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 spring-cloud-consul-dependencies - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index e5911b2b..209cd3b7 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index a0155f7a..8c36f477 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index bcb1094b..71615ece 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index e17c5b6d..6a58e422 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index d19358e6..61847b86 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index c3ec7089..7a113d68 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index 38a8357d..4d45566f 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 3.0.0.BUILD-SNAPSHOT + 3.0.0.M1 .. spring-cloud-starter-consul