From c5e68aead1f00a8a84e99b03798ed25583e7643e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 14:59:53 +0000 Subject: [PATCH] Update SNAPSHOT to 2.1.4.RELEASE --- README.adoc | 7 +++++-- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-cloudfoundry-commons/pom.xml | 2 +- spring-cloud-cloudfoundry-dependencies/pom.xml | 4 ++-- spring-cloud-cloudfoundry-discovery/pom.xml | 2 +- spring-cloud-cloudfoundry-sample/pom.xml | 2 +- spring-cloud-cloudfoundry-web/pom.xml | 2 +- spring-cloud-starter-cloudfoundry/pom.xml | 2 +- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 58926a4..55d3748 100644 --- a/README.adoc +++ b/README.adoc @@ -125,6 +125,8 @@ 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 @@ -256,6 +258,7 @@ $ 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/ ---- @@ -296,8 +299,8 @@ 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/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-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`. -IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. +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 diff --git a/docs/pom.xml b/docs/pom.xml index b44d3ea..b1895a4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index d2b74bb..b9080c0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE pom org.springframework.cloud spring-cloud-build - 2.1.8.BUILD-SNAPSHOT + 2.1.9.RELEASE @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.4.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE + 2.1.4.RELEASE true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 9019076..4212811 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.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 25b47eb..4b8cf40 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.8.BUILD-SNAPSHOT + 2.1.9.RELEASE spring-cloud-cloudfoundry-dependencies - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE 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 3ac1b8a..5cf9c8d 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.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index ca433e9..719e208 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.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3808bc1..5ad0328 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.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index fa3e1fc..e617981 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.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-cloudfoundry