diff --git a/docs/pom.xml b/docs/pom.xml
index 71a9ab772..459901477 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-netflix-docs
pom
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index 9f7c7c896..a0e369b4d 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -1,27 +1,27 @@
|===
|Name | Default | Description
-|eureka.client.eureka-connection-idle-timeout-seconds | `30` | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
-|eureka.client.eureka-server-connect-timeout-seconds | `5` | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by org.apache.http.client.HttpClient and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
+|eureka.client.eureka-connection-idle-timeout-seconds | 30 | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
+|eureka.client.eureka-server-connect-timeout-seconds | 5 | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by org.apache.http.client.HttpClient and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
|eureka.client.eureka-server-d-n-s-name | | Gets the DNS name to be queried to get the list of eureka servers.This information is not required if the contract returns the service urls by implementing serviceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
|eureka.client.eureka-server-port | | Gets the port to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS.This information is not required if the contract returns the service urls eurekaServerServiceUrls(String). The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-server-read-timeout-seconds | `8` | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
-|eureka.client.eureka-server-total-connections | `200` | Gets the total number of connections that is allowed from eureka client to all eureka servers.
-|eureka.client.eureka-server-total-connections-per-host | `50` | Gets the total number of connections that is allowed from eureka client to a eureka server host.
+|eureka.client.eureka-server-read-timeout-seconds | 8 | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
+|eureka.client.eureka-server-total-connections | 200 | Gets the total number of connections that is allowed from eureka client to all eureka servers.
+|eureka.client.eureka-server-total-connections-per-host | 50 | Gets the total number of connections that is allowed from eureka client to a eureka server host.
|eureka.client.eureka-server-u-r-l-context | | Gets the URL context to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS. This information is not required if the contract returns the service urls from eurekaServerServiceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-service-url-poll-interval-seconds | `0` | Indicates how often(in seconds) to poll for changes to eureka server information. Eureka servers could be added or removed and this setting controls how soon the eureka clients should know about it.
-|eureka.client.prefer-same-zone-eureka | `true` | Indicates whether or not this instance should try to use the eureka server in the same zone for latency and/or other reason. Ideally eureka clients are configured to talk to servers in the same zone The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
-|eureka.client.register-with-eureka | `true` | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances.
-|eureka.server.peer-eureka-nodes-update-interval-ms | `0` |
-|eureka.server.peer-eureka-status-refresh-time-interval-ms | `0` |
+|eureka.client.eureka-service-url-poll-interval-seconds | 0 | Indicates how often(in seconds) to poll for changes to eureka server information. Eureka servers could be added or removed and this setting controls how soon the eureka clients should know about it.
+|eureka.client.prefer-same-zone-eureka | true | Indicates whether or not this instance should try to use the eureka server in the same zone for latency and/or other reason. Ideally eureka clients are configured to talk to servers in the same zone The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
+|eureka.client.register-with-eureka | true | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances.
+|eureka.server.peer-eureka-nodes-update-interval-ms | 0 |
+|eureka.server.peer-eureka-status-refresh-time-interval-ms | 0 |
|management.endpoint.hystrix.config | | Hystrix settings. These are traditionally set using servlet parameters. Refer to the documentation of Hystrix for more details.
-|management.endpoint.hystrix.stream.enabled | `true` | Whether to enable the hystrix.stream endpoint.
-|management.metrics.binders.hystrix.enabled | `true` | Enables creation of OK Http Client factory beans.
-|ribbon.eureka.enabled | `true` | Enables the use of Eureka with Ribbon.
-|spring.cloud.circuitbreaker.hystrix.enabled | `true` | Enables auto-configuration of the Hystrix Spring Cloud CircuitBreaker API implementation.
-|spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `false` | Used to determine whether we should try to get the `zone` value from host name.
-|spring.cloud.loadbalancer.ribbon.enabled | `true` | Causes `RibbonLoadBalancerClient` to be used by default.
+|management.endpoint.hystrix.stream.enabled | true | Whether to enable the hystrix.stream endpoint.
+|management.metrics.binders.hystrix.enabled | true | Enables creation of OK Http Client factory beans.
+|ribbon.eureka.enabled | true | Enables the use of Eureka with Ribbon.
+|spring.cloud.circuitbreaker.hystrix.enabled | true | Enables auto-configuration of the Hystrix Spring Cloud CircuitBreaker API implementation.
+|spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | false | Used to determine whether we should try to get the `zone` value from host name.
+|spring.cloud.loadbalancer.ribbon.enabled | true | Causes `RibbonLoadBalancerClient` to be used by default.
|zuul.ribbon-isolation-strategy | |
-|zuul.ribbon.eager-load.enabled | `false` | Enables eager loading of Ribbon clients on startup.
+|zuul.ribbon.eager-load.enabled | false | Enables eager loading of Ribbon clients on startup.
|===
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 83c2408d4..4ce63294f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
pom
Spring Cloud Netflix
Spring Cloud Netflix
org.springframework.cloud
spring-cloud-build
- 2.3.2.RELEASE
+ 2.3.1.RELEASE
@@ -21,9 +21,9 @@
netflix
- 2.2.7.RELEASE
- 2.2.7.RELEASE
- Horsham.SR11
+ 2.2.7.BUILD-SNAPSHOT
+ 2.2.7.BUILD-SNAPSHOT
+ Horsham.SR9
2.2.4.RELEASE
diff --git a/spring-cloud-netflix-archaius/pom.xml b/spring-cloud-netflix-archaius/pom.xml
index 45706dfeb..7b067b9ac 100644
--- a/spring-cloud-netflix-archaius/pom.xml
+++ b/spring-cloud-netflix-archaius/pom.xml
@@ -6,7 +6,7 @@
spring-cloud-netflix
org.springframework.cloud
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-netflix-concurrency-limits/pom.xml b/spring-cloud-netflix-concurrency-limits/pom.xml
index 5cd6b43ec..98f79f970 100644
--- a/spring-cloud-netflix-concurrency-limits/pom.xml
+++ b/spring-cloud-netflix-concurrency-limits/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-concurrency-limits
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index e0510f6b3..f04247f84 100644
--- a/spring-cloud-netflix-core/pom.xml
+++ b/spring-cloud-netflix-core/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-core
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 5ca730bf1..72260b142 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -5,11 +5,11 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 2.3.2.RELEASE
+ 2.3.2.BUILD-SNAPSHOT
spring-cloud-netflix-dependencies
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
pom
spring-cloud-netflix-dependencies
Spring Cloud Netflix Dependencies
diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml
index 225fd8cf5..5da8df872 100644
--- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml
+++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-eureka-client-tls-tests
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index 829185928..1bd650528 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-eureka-client
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 56a315afb..cd44df9f2 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-eureka-server
diff --git a/spring-cloud-netflix-hystrix-contract/pom.xml b/spring-cloud-netflix-hystrix-contract/pom.xml
index f36bac6e8..28bd6182d 100644
--- a/spring-cloud-netflix-hystrix-contract/pom.xml
+++ b/spring-cloud-netflix-hystrix-contract/pom.xml
@@ -5,11 +5,11 @@
org.springframework.cloud
spring-cloud-build
- 2.3.2.RELEASE
+ 2.3.1.RELEASE
spring-cloud-netflix-hystrix-contract
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
jar
spring-cloud-netflix-hystrix-contract
Spring Cloud Netflix Hystrix Contract
diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml
index 6b47ef2fb..42985a5d4 100644
--- a/spring-cloud-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml
@@ -8,7 +8,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-netflix-hystrix-stream/pom.xml b/spring-cloud-netflix-hystrix-stream/pom.xml
index 34e5426e0..16a5ac048 100644
--- a/spring-cloud-netflix-hystrix-stream/pom.xml
+++ b/spring-cloud-netflix-hystrix-stream/pom.xml
@@ -6,7 +6,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-hystrix-stream
diff --git a/spring-cloud-netflix-hystrix/pom.xml b/spring-cloud-netflix-hystrix/pom.xml
index 4772c599a..73b07ed16 100644
--- a/spring-cloud-netflix-hystrix/pom.xml
+++ b/spring-cloud-netflix-hystrix/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-hystrix
diff --git a/spring-cloud-netflix-ribbon/pom.xml b/spring-cloud-netflix-ribbon/pom.xml
index 8f0b62656..fd260687c 100644
--- a/spring-cloud-netflix-ribbon/pom.xml
+++ b/spring-cloud-netflix-ribbon/pom.xml
@@ -5,7 +5,7 @@
spring-cloud-netflix
org.springframework.cloud
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
4.0.0
diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml
index 888874c47..b92914db8 100644
--- a/spring-cloud-netflix-sidecar/pom.xml
+++ b/spring-cloud-netflix-sidecar/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-sidecar
diff --git a/spring-cloud-netflix-turbine-stream/pom.xml b/spring-cloud-netflix-turbine-stream/pom.xml
index 8fa84b99b..43d2779e3 100644
--- a/spring-cloud-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-netflix-turbine-stream/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-turbine-stream
diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml
index ba0899179..addf17f46 100644
--- a/spring-cloud-netflix-turbine/pom.xml
+++ b/spring-cloud-netflix-turbine/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-netflix-turbine
diff --git a/spring-cloud-netflix-zuul/pom.xml b/spring-cloud-netflix-zuul/pom.xml
index f87700691..94fca6728 100644
--- a/spring-cloud-netflix-zuul/pom.xml
+++ b/spring-cloud-netflix-zuul/pom.xml
@@ -6,7 +6,7 @@
spring-cloud-netflix
org.springframework.cloud
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-starter-netflix/pom.xml b/spring-cloud-starter-netflix/pom.xml
index 6aec6e322..60a9ad86b 100644
--- a/spring-cloud-starter-netflix/pom.xml
+++ b/spring-cloud-starter-netflix/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
..
spring-cloud-starter-netflix
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
index 64de0c246..5126db46f 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-archaius
Spring Cloud Starter Netflix Archaius
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
index aa368bc41..6adf40c3d 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-eureka-client
Spring Cloud Starter Netflix Eureka Client
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
index 0090d15bf..de05bee47 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-server/pom.xml
@@ -3,7 +3,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-eureka-server
Spring Cloud Starter Netflix Eureka Server
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
index 929f5f1f6..b173a2a21 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-hystrix-dashboard
Spring Cloud Starter Netflix Hystrix Dashboard
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
index 51632cef7..e7cddc66e 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-hystrix
Spring Cloud Starter Netflix Hystrix
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
index 03d7f9262..eac0ef2b5 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-ribbon
Spring Cloud Starter Netflix Ribbon
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
index 29cc28ed3..3dcfed4a3 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-turbine-stream
Spring Cloud Starter Netflix Turbine Stream
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
index a3141b40a..40a697048 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-turbine
Spring Cloud Starter Netflix Turbine
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
index 65d4dc605..09becbc13 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml
@@ -4,7 +4,7 @@
org.springframework.cloud
spring-cloud-starter-netflix
- 2.2.7.RELEASE
+ 2.2.7.BUILD-SNAPSHOT
spring-cloud-starter-netflix-zuul
Spring Cloud Starter Netflix Zuul