From e26cd3b26aa0cc1eaa1337c418b89841aa84bb46 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:10:34 +0000 Subject: [PATCH 01/10] Update SNAPSHOT to 1.1.2.RELEASE --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- 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 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9b5ef..98dcf02 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index f599cc7..4d96df5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +4,21 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE pom org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE cloudfoundry ${basedir} - 1.4.0.BUILD-SNAPSHOT - 1.3.0.BUILD-SNAPSHOT + 1.4.5.RELEASE + 1.3.4.RELEASE diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d39823f..ac03c29 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-cloudfoundry-dependencies - 1.1.2.BUILD-SNAPSHOT + 1.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 e91d476..e4a94fe 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 441dfeb..4e29519 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3ea2e55..0b301a3 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 4eabbd6..b6a297f 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.2.RELEASE .. spring-cloud-starter-cloudfoundry From d2654d38947ceb515a480410bf173d01c7c24995 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:12:00 +0000 Subject: [PATCH 02/10] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- 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 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 98dcf02..3e9b5ef 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 4d96df5..f599cc7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,21 +4,21 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 1.3.10.RELEASE + 1.3.5.BUILD-SNAPSHOT cloudfoundry ${basedir} - 1.4.5.RELEASE - 1.3.4.RELEASE + 1.4.0.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index ac03c29..d39823f 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.10.RELEASE + 1.3.5.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 1.1.2.RELEASE + 1.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 e4a94fe..e91d476 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 4e29519..441dfeb 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 0b301a3..3ea2e55 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index b6a297f..4eabbd6 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.RELEASE + 1.1.2.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From b64020f78abce6bc5571873988dba4c8ad98c6d2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 29 Jun 2018 17:12:00 +0000 Subject: [PATCH 03/10] Bumping versions to 1.1.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- 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 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 3e9b5ef..e069ca5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index f599cc7..edc3642 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ 4.0.0 spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index d39823f..78e3a9a 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.5.BUILD-SNAPSHOT + 1.3.10.RELEASE spring-cloud-cloudfoundry-dependencies - 1.1.2.BUILD-SNAPSHOT + 1.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 e91d476..3634ff7 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 441dfeb..47d5262 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3ea2e55..25266d3 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 4eabbd6..b833991 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 1.1.2.BUILD-SNAPSHOT + 1.1.3.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From e7512818b5f3aa7d627fb8b35897cd53a3dd32e8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 18:04:14 +0000 Subject: [PATCH 04/10] Update SNAPSHOT to 2.0.1.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, 14 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index a9b5f21..5ccae1f 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ can use the `DiscoveryClient` directly or via a `LoadBalancerClient`. == Building -:jdkversion: 1.8 +:jdkversion: 1.7 === Basic Compile and Test @@ -71,7 +71,7 @@ https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, rabbit and redis. -NOTE: If all else fails, build with the command from `.circle.yml` (usually +NOTE: If all else fails, build with the command from `.travis.yml` (usually `./mvnw install`). === Documentation diff --git a/docs/pom.xml b/docs/pom.xml index 798276e..ddf87ab 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 3d0a85f..3f137d1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE pom org.springframework.cloud spring-cloud-build - 2.0.2.BUILD-SNAPSHOT + 2.0.4.RELEASE @@ -18,8 +18,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.0.1.BUILD-SNAPSHOT - 2.0.1.BUILD-SNAPSHOT + 2.0.2.RELEASE + 2.0.2.RELEASE diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 73f6495..00216c4 100644 --- a/spring-cloud-cloudfoundry-commons/pom.xml +++ b/spring-cloud-cloudfoundry-commons/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 0f5c77c..c08a8d9 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.2.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-cloudfoundry-dependencies - 2.0.1.BUILD-SNAPSHOT + 2.0.1.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 d02810f..43115b4 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index a6c8a00..85ed2b2 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3b092b5..2359192 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 1c9447a..df5336f 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.1.RELEASE .. spring-cloud-starter-cloudfoundry From 6b7141861a1eacb1779773c5bfe130aebd84381b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 18:06:43 +0000 Subject: [PATCH 05/10] 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, 14 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 5ccae1f..a9b5f21 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ can use the `DiscoveryClient` directly or via a `LoadBalancerClient`. == Building -:jdkversion: 1.7 +:jdkversion: 1.8 === Basic Compile and Test @@ -71,7 +71,7 @@ https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, rabbit and redis. -NOTE: If all else fails, build with the command from `.travis.yml` (usually +NOTE: If all else fails, build with the command from `.circle.yml` (usually `./mvnw install`). === Documentation diff --git a/docs/pom.xml b/docs/pom.xml index ddf87ab..798276e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 3f137d1..3d0a85f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.0.2.BUILD-SNAPSHOT @@ -18,8 +18,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.0.2.RELEASE - 2.0.2.RELEASE + 2.0.1.BUILD-SNAPSHOT + 2.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 00216c4..73f6495 100644 --- a/spring-cloud-cloudfoundry-commons/pom.xml +++ b/spring-cloud-cloudfoundry-commons/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index c08a8d9..0f5c77c 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.4.RELEASE + 2.0.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies - 2.0.1.RELEASE + 2.0.1.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 43115b4..d02810f 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index 85ed2b2..a6c8a00 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 2359192..3b092b5 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index df5336f..1c9447a 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.RELEASE + 2.0.1.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 9abdc8f3225e3705e77c18797366a28ab113764e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Oct 2018 18:06:44 +0000 Subject: [PATCH 06/10] Bumping versions to 2.0.2.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- 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, 10 insertions(+), 10 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 798276e..a573d7e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT spring-cloud-cloudfoundry-docs pom diff --git a/pom.xml b/pom.xml index 3d0a85f..f297250 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ 4.0.0 spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.0.2.BUILD-SNAPSHOT + 2.0.4.RELEASE diff --git a/spring-cloud-cloudfoundry-commons/pom.xml b/spring-cloud-cloudfoundry-commons/pom.xml index 73f6495..6275d79 100644 --- a/spring-cloud-cloudfoundry-commons/pom.xml +++ b/spring-cloud-cloudfoundry-commons/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 0f5c77c..8b9ee5e 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.2.BUILD-SNAPSHOT + 2.0.4.RELEASE spring-cloud-cloudfoundry-dependencies - 2.0.1.BUILD-SNAPSHOT + 2.0.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 d02810f..5134a62 100644 --- a/spring-cloud-cloudfoundry-discovery/pom.xml +++ b/spring-cloud-cloudfoundry-discovery/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-sample/pom.xml b/spring-cloud-cloudfoundry-sample/pom.xml index a6c8a00..2db6bfd 100644 --- a/spring-cloud-cloudfoundry-sample/pom.xml +++ b/spring-cloud-cloudfoundry-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-cloudfoundry-web/pom.xml b/spring-cloud-cloudfoundry-web/pom.xml index 3b092b5..c2e3c47 100644 --- a/spring-cloud-cloudfoundry-web/pom.xml +++ b/spring-cloud-cloudfoundry-web/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-cloudfoundry/pom.xml b/spring-cloud-starter-cloudfoundry/pom.xml index 1c9447a..d4fa826 100644 --- a/spring-cloud-starter-cloudfoundry/pom.xml +++ b/spring-cloud-starter-cloudfoundry/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-cloudfoundry - 2.0.1.BUILD-SNAPSHOT + 2.0.2.BUILD-SNAPSHOT .. spring-cloud-starter-cloudfoundry From 330300d1b59b78b9ced874456b1289f2a5973f23 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 23 Oct 2018 17:13:46 -0400 Subject: [PATCH 07/10] Updates s-c-build to 2.0.5.BUILD-SNAPSHOT --- pom.xml | 2 +- spring-cloud-cloudfoundry-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f297250..d0aa062 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 2.0.4.RELEASE + 2.0.5.BUILD-SNAPSHOT diff --git a/spring-cloud-cloudfoundry-dependencies/pom.xml b/spring-cloud-cloudfoundry-dependencies/pom.xml index 8b9ee5e..c03223b 100644 --- a/spring-cloud-cloudfoundry-dependencies/pom.xml +++ b/spring-cloud-cloudfoundry-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.0.4.RELEASE + 2.0.5.BUILD-SNAPSHOT spring-cloud-cloudfoundry-dependencies From 9f15e6ebeb0905b1ba2af5b2d4ad45170bb750fc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 14 Feb 2019 17:47:21 +0000 Subject: [PATCH 08/10] Bumping versions --- README.adoc | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++-- pom.xml | 4 +- 2 files changed, 139 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index a9b5f21..c73f895 100644 --- a/README.adoc +++ b/README.adoc @@ -30,7 +30,7 @@ can use the `DiscoveryClient` directly or via a `LoadBalancerClient`. == Building -:jdkversion: 1.8 +:jdkversion: 1.7 === Basic Compile and Test @@ -71,7 +71,7 @@ https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, rabbit and redis. -NOTE: If all else fails, build with the command from `.circle.yml` (usually +NOTE: If all else fails, build with the command from `.travis.yml` (usually `./mvnw install`). === Documentation @@ -121,6 +121,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 @@ -164,4 +166,136 @@ added after the original pull request but before a merge. other target branch in the main project). * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). \ No newline at end of file + message (where XXXX is the issue number). + +=== Checkstyle + +Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are: + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    └── checkstyle.xml <1> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules + +==== Checkstyle configuration + +Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins. + +.pom.xml +---- + +true <1> + true + <2> + true + <3> + + + + + <4> + io.spring.javaformat + spring-javaformat-maven-plugin + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + +---- +<1> Fails the build upon Checkstyle errors +<2> Fails the build upon Checkstyle violations +<3> Checkstyle analyzes also the test sources +<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules +<5> Add checkstyle plugin to your build and reporting phases + +If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example: + +.projectRoot/src/checkstyle/checkstyle-suppresions.xml +---- + + + + + + +---- + +It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script: + +```bash +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig +$ touch .springformat +``` + +=== IDE setup + +==== Intellij IDEA + +In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    ├── checkstyle.xml <1> +    └── intellij +       ├── Intellij_Project_Defaults.xml <4> +       └── Intellij_Spring_Boot_Java_Conventions.xml <5> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules +<4> Project defaults for Intellij that apply most of Checkstyle rules +<5> Project style conventions for Intellij that apply most of Checkstyle rules + +.Code style + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file. + +.Inspection profiles + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file. + +.Checkstyle + +To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle] + +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.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 diff --git a/pom.xml b/pom.xml index d0aa062..725327b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,8 +18,8 @@ 3.9.0.RELEASE cloudfoundry ${basedir} - 2.0.1.BUILD-SNAPSHOT - 2.0.1.BUILD-SNAPSHOT + 2.0.3.BUILD-SNAPSHOT + 2.0.3.BUILD-SNAPSHOT From 2b221b86645eca103f2e767b41674f764ab998e8 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 7 Mar 2019 17:43:14 +0100 Subject: [PATCH 09/10] Whitelisted --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index ac77bf5..b475b26 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ spring-cloud-cloudfoundry ${basedir}/.. - 1.0.x,1.1.x + 1.0.x,1.1.x,2.1.x From 6e00837968930a1b42d398a2861129a9846a450d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 14 Mar 2019 07:43:02 -0400 Subject: [PATCH 10/10] Adding circle 2.0 config --- .circleci/config.yml | 40 ++++++++++++++++++++++++++++++++++++++++ circle.yml | 20 -------------------- 2 files changed, 40 insertions(+), 20 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..d186f79 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,40 @@ +version: 2 +jobs: + build: + docker: + - image: springcloud/pipeline-base + user: appuser + environment: + _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" + TERM: dumb + branches: + ignore: + - gh-pages # list of branches to ignore + resource_class: large + steps: + - checkout + - restore_cache: + key: sc-cloudfoundry-{{ .Branch }} + - run: + name: "Download dependencies" + command: ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true + - save_cache: + key: sc-cloudfoundry-{{ .Branch }} + paths: + - ~/.m2 + - run: + name: "Running build" + command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + - run: + name: "Aggregate test results" + when: always + command: | + mkdir -p ~/junit/ + find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \; + bash <(curl -s https://codecov.io/bash) + - store_artifacts: + path: ~/junit/ + destination: artifacts + - store_test_results: + path: ~/junit/ + destination: testartifacts \ No newline at end of file diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 3e841d9..0000000 --- a/circle.yml +++ /dev/null @@ -1,20 +0,0 @@ -general: - branches: - ignore: - - gh-pages # list of branches to ignore -machine: - java: - version: oraclejdk8 - environment: - _JAVA_OPTIONS: "-Xms1024m -Xmx2048m" -dependencies: - override: - - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true -test: - override: - - ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn - post: - - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS - - mkdir -p $CIRCLE_TEST_REPORTS/junit/ - - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; - - bash <(curl -s https://codecov.io/bash)