diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index db1b8dc2..8f867124 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -1,29 +1,29 @@ |=== |Name | Default | Description -|spring.cloud.zookeeper.base-sleep-time-ms | 50 | Initial amount of time to wait between retries. +|spring.cloud.zookeeper.base-sleep-time-ms | `50` | Initial amount of time to wait between retries. |spring.cloud.zookeeper.block-until-connected-unit | | The unit of time related to blocking on connection to Zookeeper. -|spring.cloud.zookeeper.block-until-connected-wait | 10 | Wait time to block on connection to Zookeeper. -|spring.cloud.zookeeper.connect-string | localhost:2181 | Connection string to the Zookeeper cluster. +|spring.cloud.zookeeper.block-until-connected-wait | `10` | Wait time to block on connection to Zookeeper. +|spring.cloud.zookeeper.connect-string | `localhost:2181` | Connection string to the Zookeeper cluster. |spring.cloud.zookeeper.connection-timeout | | The configured connection timeout in milliseconds. |spring.cloud.zookeeper.default-health-endpoint | | Default health endpoint that will be checked to verify that a dependency is alive. |spring.cloud.zookeeper.dependencies | | Mapping of alias to ZookeeperDependency. From Ribbon perspective the alias is actually serviceID since Ribbon can't accept nested structures in serviceID. |spring.cloud.zookeeper.dependency-configurations | | |spring.cloud.zookeeper.dependency-names | | -|spring.cloud.zookeeper.discovery.enabled | true | +|spring.cloud.zookeeper.discovery.enabled | `true` | |spring.cloud.zookeeper.discovery.initial-status | | The initial status of this instance (defaults to {@link StatusConstants#STATUS_UP}). |spring.cloud.zookeeper.discovery.instance-host | | Predefined host with which a service can register itself in Zookeeper. Corresponds to the {code address} from the URI spec. |spring.cloud.zookeeper.discovery.instance-id | | Id used to register with zookeeper. Defaults to a random UUID. |spring.cloud.zookeeper.discovery.instance-port | | Port to register the service under (defaults to listening port). |spring.cloud.zookeeper.discovery.instance-ssl-port | | Ssl port of the registered service. |spring.cloud.zookeeper.discovery.metadata | | Gets the metadata name/value pairs associated with this instance. This information is sent to zookeeper and can be used by other instances. -|spring.cloud.zookeeper.discovery.order | 0 | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. -|spring.cloud.zookeeper.discovery.register | true | Register as a service in zookeeper. -|spring.cloud.zookeeper.discovery.root | /services | Root Zookeeper folder in which all instances are registered. -|spring.cloud.zookeeper.discovery.uri-spec | {scheme}://{address}:{port} | The URI specification to resolve during service registration in Zookeeper. -|spring.cloud.zookeeper.enabled | true | Is Zookeeper enabled. -|spring.cloud.zookeeper.max-retries | 10 | Max number of times to retry. -|spring.cloud.zookeeper.max-sleep-ms | 500 | Max time in ms to sleep on each retry. +|spring.cloud.zookeeper.discovery.order | `0` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients. +|spring.cloud.zookeeper.discovery.register | `true` | Register as a service in zookeeper. +|spring.cloud.zookeeper.discovery.root | `/services` | Root Zookeeper folder in which all instances are registered. +|spring.cloud.zookeeper.discovery.uri-spec | `{scheme}://{address}:{port}` | The URI specification to resolve during service registration in Zookeeper. +|spring.cloud.zookeeper.enabled | `true` | Is Zookeeper enabled. +|spring.cloud.zookeeper.max-retries | `10` | Max number of times to retry. +|spring.cloud.zookeeper.max-sleep-ms | `500` | Max time in ms to sleep on each retry. |spring.cloud.zookeeper.prefix | | Common prefix that will be applied to all Zookeeper dependencies' paths. |spring.cloud.zookeeper.session-timeout | | The configured/negotiated session timeout in milliseconds. Please refer to Curator's Tech Note 14 to understand how Curator implements connection sessions. @see Curator's Tech Note 14 diff --git a/pom.xml b/pom.xml index c9c88eaf..4e5d4bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.3.RELEASE @@ -177,11 +177,11 @@ - 2.3.1.RELEASE - 2.2.7.BUILD-SNAPSHOT - 2.2.7.BUILD-SNAPSHOT - 2.2.7.BUILD-SNAPSHOT - 2.2.7.BUILD-SNAPSHOT + 2.3.3.RELEASE + 2.2.8.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT + 2.2.8.BUILD-SNAPSHOT diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 4414d167..b040b2ca 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.3.RELEASE spring-cloud-zookeeper-dependencies