diff --git a/docs/README.adoc b/docs/README.adoc
index 2f9c0a77f..9bbecde45 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -322,7 +322,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring
Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
-- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
diff --git a/docs/pom.xml b/docs/pom.xml
index 8a4873536..cefdd787a 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
spring-cloud-netflix-docs
pom
diff --git a/pom.xml b/pom.xml
index 1dda5cbb9..0848095b6 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
pom
Spring Cloud Netflix
Spring Cloud Netflix
org.springframework.cloud
spring-cloud-build
- 2.1.9.RELEASE
+ 2.1.8.BUILD-SNAPSHOT
@@ -21,8 +21,8 @@
netflix
- 2.1.4.RELEASE
- 2.1.5.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
+ 2.1.5.BUILD-SNAPSHOT
Fishtown.SR4
2.1.3.RELEASE
diff --git a/spring-cloud-netflix-archaius/pom.xml b/spring-cloud-netflix-archaius/pom.xml
index 4f45c563e..03fc28e77 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-netflix-concurrency-limits/pom.xml b/spring-cloud-netflix-concurrency-limits/pom.xml
index 785b183ff..6a597c3ae 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-concurrency-limits
diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml
index 55ba0c354..40aa34b32 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-core
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 12c0d627b..8274d91e3 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.1.9.RELEASE
+ 2.1.8.BUILD-SNAPSHOT
spring-cloud-netflix-dependencies
- 2.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
pom
spring-cloud-netflix-dependencies
Spring Cloud Netflix Dependencies
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index 8a01d93a1..61e71d011 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.1.4.RELEASE
+ 2.1.4.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 26674baec..24ee4ec1a 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.1.4.RELEASE
+ 2.1.4.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 1a8bb6813..1b8e5124b 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.1.9.RELEASE
+ 2.1.8.BUILD-SNAPSHOT
spring-cloud-netflix-hystrix-contract
- 2.1.4.RELEASE
+ 2.1.4.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 7e1555a7a..b827a27d2 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-netflix-hystrix-stream/pom.xml b/spring-cloud-netflix-hystrix-stream/pom.xml
index 2df439381..4aad38e2f 100644
--- a/spring-cloud-netflix-hystrix-stream/pom.xml
+++ b/spring-cloud-netflix-hystrix-stream/pom.xml
@@ -5,7 +5,7 @@
org.springframework.cloud
spring-cloud-netflix
- 2.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-hystrix-stream
diff --git a/spring-cloud-netflix-hystrix/pom.xml b/spring-cloud-netflix-hystrix/pom.xml
index c27f51b0c..28eac5c8f 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-hystrix
diff --git a/spring-cloud-netflix-ribbon/pom.xml b/spring-cloud-netflix-ribbon/pom.xml
index 8b335e365..40420d96a 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
4.0.0
diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml
index a7e895b18..283b0f02a 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.1.4.RELEASE
+ 2.1.4.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 966bc3fd3..53ba73789 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-turbine-stream
diff --git a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java
index 0cfaefbfd..7b689c197 100644
--- a/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java
+++ b/spring-cloud-netflix-turbine-stream/src/test/java/org/springframework/cloud/netflix/turbine/stream/TurbineStreamTests.java
@@ -59,8 +59,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(webEnvironment = RANDOM_PORT, properties = {
- // TODO: we don't need this if we harmonize the turbine and hystrix
- // destinations
+ // TODO: we don't need this if we harmonize the turbine and hystrix
+ // destinations
// https://github.com/spring-cloud/spring-cloud-netflix/issues/1948
"spring.cloud.stream.bindings.turbineStreamInput.destination=hystrixStreamOutput",
"spring.jmx.enabled=true", "stubrunner.workOffline=true",
diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml
index 7cac787a6..46b6d174c 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
spring-cloud-netflix-turbine
diff --git a/spring-cloud-netflix-zuul/pom.xml b/spring-cloud-netflix-zuul/pom.xml
index 216bed755..3b8806d0f 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
..
diff --git a/spring-cloud-starter-netflix/pom.xml b/spring-cloud-starter-netflix/pom.xml
index 177e117c0..b2e77ad6a 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.1.4.RELEASE
+ 2.1.4.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 141d7ef3f..241034445 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.1.4.RELEASE
+ 2.1.4.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 f68f08bf6..0005a67c2 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.1.4.RELEASE
+ 2.1.4.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 790579e48..bef13e21b 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.1.4.RELEASE
+ 2.1.4.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 c2cdc230c..90fa1843b 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.1.4.RELEASE
+ 2.1.4.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 989261ff2..c1038807c 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.1.4.RELEASE
+ 2.1.4.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 82209df43..0f9ea6ff8 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.1.4.RELEASE
+ 2.1.4.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 cb9d45418..3910b21e7 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.1.4.RELEASE
+ 2.1.4.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 d42afefd5..993f9f22a 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.1.4.RELEASE
+ 2.1.4.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 61597f555..139aa10fa 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.1.4.RELEASE
+ 2.1.4.BUILD-SNAPSHOT
spring-cloud-starter-netflix-zuul
Spring Cloud Starter Netflix Zuul