From c96ed33dd43d00ab4069f9a8b7211d674b85e439 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 11 Jun 2019 19:09:44 +0000 Subject: [PATCH 01/12] Update SNAPSHOT to 2.1.2.RELEASE --- README.adoc | 4 +++- 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, 15 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index 58926a4..ad1934d 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 @@ -300,4 +302,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. +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 270a864..0a417b1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 9dbaa62..afffac5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.2.BUILD-SNAPSHOT + 2.1.2.RELEASE pom org.springframework.cloud spring-cloud-build - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 2.1.2.RELEASE + 2.1.2.RELEASE true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index bc0c58b..505ac1c 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.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index fa1f527..2264c64 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE spring-cloud-cloudfoundry-dependencies - 2.1.2.BUILD-SNAPSHOT + 2.1.2.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 5559710..71ea837 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.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 0905c21..442ccdb 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.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 2ef4aee..9d6d8d5 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.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index e897b44..bdea581 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.2.BUILD-SNAPSHOT + 2.1.2.RELEASE .. spring-cloud-starter-cloudfoundry From 814017ec25abeac2ba86e1b633b9581df0f13e11 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 11 Jun 2019 19:11:07 +0000 Subject: [PATCH 02/12] Going back to snapshots --- README.adoc | 4 +--- 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, 13 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index ad1934d..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 @@ -302,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 0a417b1..270a864 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index afffac5..9dbaa62 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.2.RELEASE + 2.1.2.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.1.5.RELEASE + 2.1.5.BUILD-SNAPSHOT @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.2.RELEASE - 2.1.2.RELEASE + 2.1.1.BUILD-SNAPSHOT + 2.1.1.BUILD-SNAPSHOT true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 505ac1c..bc0c58b 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.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 2264c64..fa1f527 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.5.RELEASE + 2.1.5.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.1.2.RELEASE + 2.1.2.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 71ea837..5559710 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.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 442ccdb..0905c21 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.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 9d6d8d5..2ef4aee 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.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index bdea581..e897b44 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.2.RELEASE + 2.1.2.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 2ca47f697b2b131017120e3a337a48e550640efb Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 11 Jun 2019 19:11:07 +0000 Subject: [PATCH 03/12] Bumping versions to 2.1.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-cloudfoundry-commons/pom.xml | 2 +- spring-cloud-cloudfoundry-dependencies/pom.xml | 2 +- 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 270a864..a850255 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 9dbaa62..617b997 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT pom diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index bc0c58b..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.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index fa1f527..d45c1dc 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-cloudfoundry-dependencies - 2.1.2.BUILD-SNAPSHOT + 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 5559710..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.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 0905c21..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.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 2ef4aee..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.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index e897b44..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.2.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 3364b53c409fad9641ec34cb7a1953d38cdfe2b0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 16:57:16 +0000 Subject: [PATCH 04/12] Update SNAPSHOT to 2.1.2.RELEASE --- README.adoc | 4 +++- 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, 15 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index 58926a4..ad1934d 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 @@ -300,4 +302,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. +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 a850255..0a417b1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.2.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 617b997..afffac5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.2.RELEASE pom org.springframework.cloud spring-cloud-build - 2.1.5.BUILD-SNAPSHOT + 2.1.5.RELEASE @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 2.1.2.RELEASE + 2.1.2.RELEASE true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 87b269e..505ac1c 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.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d45c1dc..2264c64 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.5.BUILD-SNAPSHOT + 2.1.5.RELEASE spring-cloud-cloudfoundry-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.2.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 d1fb249..71ea837 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.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 736e1c4..442ccdb 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.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index a59fd7e..9d6d8d5 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.BUILD-SNAPSHOT + 2.1.2.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 9d7902a..bdea581 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.BUILD-SNAPSHOT + 2.1.2.RELEASE .. spring-cloud-starter-cloudfoundry From 67808a7bfc8cad84c6a651d91c4edcac83b86e7f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 16:58:07 +0000 Subject: [PATCH 05/12] Going back to snapshots --- README.adoc | 4 +--- 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, 13 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index ad1934d..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 @@ -302,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 0a417b1..a850255 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.2.RELEASE + 2.1.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index afffac5..617b997 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.2.RELEASE + 2.1.3.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.1.5.RELEASE + 2.1.5.BUILD-SNAPSHOT @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.2.RELEASE - 2.1.2.RELEASE + 2.1.1.BUILD-SNAPSHOT + 2.1.1.BUILD-SNAPSHOT true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 505ac1c..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.2.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 2264c64..d45c1dc 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.5.RELEASE + 2.1.5.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.1.2.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 71ea837..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.2.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 442ccdb..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.2.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 9d6d8d5..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.2.RELEASE + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index bdea581..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.2.RELEASE + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 9c6ae81a03224873fced9329221c9d71d15c71c9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 20 Jun 2019 16:58:08 +0000 Subject: [PATCH 06/12] Bumping versions to 2.1.4.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-cloudfoundry-commons/pom.xml | 2 +- spring-cloud-cloudfoundry-dependencies/pom.xml | 2 +- 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a850255..b44d3ea 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 617b997..d629f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 87b269e..9019076 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d45c1dc..88aac4d 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-cloudfoundry-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.4.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 d1fb249..3ac1b8a 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 736e1c4..ca433e9 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index a59fd7e..3808bc1 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 9d7902a..fa3e1fc 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From dfabce205d55fd998259fe8addd30fd95c74d2cd Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 21 Jun 2019 12:18:48 -0400 Subject: [PATCH 07/12] Bumps to 2.1.3.BUILD-SNAPSHOT build to 2.1.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 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index b44d3ea..a850255 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.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index d629f4f..d71e20f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.1.5.BUILD-SNAPSHOT + 2.1.7.BUILD-SNAPSHOT @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.1.BUILD-SNAPSHOT - 2.1.1.BUILD-SNAPSHOT + 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 9019076..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.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 88aac4d..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.5.BUILD-SNAPSHOT + 2.1.7.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.1.4.BUILD-SNAPSHOT + 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 3ac1b8a..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.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index ca433e9..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.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3808bc1..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.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index fa3e1fc..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.4.BUILD-SNAPSHOT + 2.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 4cf3a7c57d0b1e24cbfa8a7d6ee37bc78106f8ea Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 29 Jul 2019 14:34:07 +0200 Subject: [PATCH 08/12] Added symbolic link of index.adoc --- docs/src/main/asciidoc/index.adoc | 1 + 1 file changed, 1 insertion(+) create mode 120000 docs/src/main/asciidoc/index.adoc diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc new file mode 120000 index 0000000..d5d8ab2 --- /dev/null +++ b/docs/src/main/asciidoc/index.adoc @@ -0,0 +1 @@ +spring-cloud-cloudfoundry.adoc \ No newline at end of file From 8ff4f7dab47d37defdbca13544642cec1f62fa2d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 19:07:09 +0000 Subject: [PATCH 09/12] Update SNAPSHOT to 2.1.3.RELEASE --- README.adoc | 5 ++++- 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, 16 insertions(+), 13 deletions(-) diff --git a/README.adoc b/README.adoc index 58926a4..91ba0b6 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/ ---- @@ -300,4 +303,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. +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 a850255..c141915 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index d71e20f..ea7232c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE pom org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.7.RELEASE @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.3.RELEASE + 2.1.3.RELEASE true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 87b269e..6de0055 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.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 6e88da7..d0a1f76 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.BUILD-SNAPSHOT + 2.1.7.RELEASE spring-cloud-cloudfoundry-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.3.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 d1fb249..75e150e 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.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 736e1c4..0af339c 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.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index a59fd7e..e98bf2b 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.BUILD-SNAPSHOT + 2.1.3.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 9d7902a..102749b 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.BUILD-SNAPSHOT + 2.1.3.RELEASE .. spring-cloud-starter-cloudfoundry From f70c5159298e5cfbe89159aa40f663e93fec6b0c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 19:08:29 +0000 Subject: [PATCH 10/12] Going back to snapshots --- README.adoc | 5 +---- 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, 13 insertions(+), 16 deletions(-) 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 From ec8ae98ac9314803e3f05d5d59e41f3ffed52a74 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Sep 2019 19:08:29 +0000 Subject: [PATCH 11/12] Bumping versions to 2.1.4.BUILD-SNAPSHOT after release --- 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 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index a850255..b44d3ea 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index d71e20f..d2b74bb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.1.7.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT @@ -19,8 +19,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT true true diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 87b269e..9019076 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 6e88da7..25b47eb 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.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.4.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 d1fb249..3ac1b8a 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 736e1c4..ca433e9 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index a59fd7e..3808bc1 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 9d7902a..fa3e1fc 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.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From ddf29d4d69a9ccb0029176234ff1b24fe0e76305 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 18 Sep 2019 12:22:50 +0200 Subject: [PATCH 12/12] Remove spring.provides. --- .../src/main/resources/META-INF/spring.provides | 1 - 1 file changed, 1 deletion(-) delete mode 100644 spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides diff --git a/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 3ca5984..0000000 --- a/spring-cloud-starter-cloudfoundry/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-security