diff --git a/README.adoc b/README.adoc index 91ba0b6..58926a4 100644 --- a/README.adoc +++ b/README.adoc @@ -125,8 +125,6 @@ from the `file` menu. == Contributing -:spring-cloud-build-branch: master - Spring Cloud is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want @@ -258,7 +256,6 @@ $ touch .springformat ==== Intellij IDEA In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. -The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project. .spring-cloud-build-tools/ ---- @@ -303,4 +300,4 @@ Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on t - `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`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. \ No newline at end of file +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. diff --git a/docs/pom.xml b/docs/pom.xml index c141915..a850255 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index ea7232c..d71e20f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.3.RELEASE - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 6de0055..87b269e 100644 --- a/spring-cloud-cloudfoundry-commons/pom.xml +++ b/spring-cloud-cloudfoundry-commons/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d0a1f76..6e88da7 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.7.RELEASE + 2.1.7.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT pom spring-cloud-cloudfoundry-dependencies Spring Cloud Cloudfoundry Dependencies diff --git a/spring-cloud-cloudfoundry-discovery/pom.xml b/spring-cloud-cloudfoundry-discovery/pom.xml index 75e150e..d1fb249 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 0af339c..736e1c4 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index e98bf2b..a59fd7e 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 102749b..9d7902a 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry