From 0ca0d4f8e04439b533a623a3ef6075d425e8d930 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 15:14:41 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 2.1.4.RELEASE --- README.adoc | 5 +++-- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/README.adoc b/README.adoc index e813995a..d14de98a 100644 --- a/README.adoc +++ b/README.adoc @@ -83,7 +83,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://compose.docker.io/[Docker Compose] to run the middeware servers +https://docs.docker.com/compose/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -273,6 +273,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/ ---- @@ -313,7 +314,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/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`. diff --git a/docs/pom.xml b/docs/pom.xml index ba860451..18da6eb0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index a6368a10..64c0dc65 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 2.1.8.BUILD-SNAPSHOT + 2.1.9.RELEASE - 2.1.4.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE + 2.1.4.RELEASE + 2.1.5.RELEASE + 2.1.4.RELEASE 1.0.3.RELEASE - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE Fishtown.SR4 true diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index a1795b52..f941819c 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 120d72f0..5669be3e 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 2706bddb..6e5e7c82 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 8f5e2e03..6c5557ae 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-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-consul-dependencies - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 93dd153e..fe5a7c33 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index d1f7879d..a2b58356 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 592ec86c..86db402d 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index bd6c6b73..7bb14a33 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 55a3e457..f4c4f8b7 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 980d6761..4fb679e3 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index bf3b757e..ba02221c 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.4.RELEASE .. spring-cloud-starter-consul From 9638bed9367709414d0c529290221bc5c726ee29 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 15:16:22 +0000 Subject: [PATCH 2/5] Going back to snapshots --- README.adoc | 5 ++--- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) diff --git a/README.adoc b/README.adoc index d14de98a..e813995a 100644 --- a/README.adoc +++ b/README.adoc @@ -83,7 +83,7 @@ credentials and you already have those. The projects that require middleware generally include a `docker-compose.yml`, so consider using -https://docs.docker.com/compose/[Docker Compose] to run the middeware servers +https://compose.docker.io/[Docker Compose] to run the middeware servers in Docker containers. See the README in the https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, @@ -273,7 +273,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/ ---- @@ -314,7 +313,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 18da6eb0..ba860451 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index 64c0dc65..a6368a10 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 2.1.9.RELEASE + 2.1.8.BUILD-SNAPSHOT - 2.1.4.RELEASE - 2.1.4.RELEASE - 2.1.5.RELEASE - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT 1.0.3.RELEASE - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT Fishtown.SR4 true diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index f941819c..a1795b52 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 5669be3e..120d72f0 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 6e5e7c82..2706bddb 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 6c5557ae..8f5e2e03 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.9.RELEASE + 2.1.8.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index fe5a7c33..93dd153e 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index a2b58356..d1f7879d 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 86db402d..592ec86c 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index 7bb14a33..bd6c6b73 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index f4c4f8b7..55a3e457 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 4fb679e3..980d6761 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index ba02221c..bf3b757e 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.RELEASE + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-consul From deedfa0a768cf73b2248b97a18be81f44a523f9a Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 18 Nov 2019 15:16:22 +0000 Subject: [PATCH 3/5] Bumping versions to 2.1.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- spring-cloud-consul-discovery/pom.xml | 2 +- spring-cloud-consul-sample/pom.xml | 2 +- spring-cloud-starter-consul-all/pom.xml | 2 +- spring-cloud-starter-consul-bus/pom.xml | 2 +- spring-cloud-starter-consul-config/pom.xml | 2 +- spring-cloud-starter-consul-discovery/pom.xml | 2 +- spring-cloud-starter-consul/pom.xml | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ba860451..6fa3b494 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/pom.xml b/pom.xml index a6368a10..33774cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 2.1.8.BUILD-SNAPSHOT + 2.1.10.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT - 2.1.5.BUILD-SNAPSHOT - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT + 2.1.6.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT 1.0.3.RELEASE - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT Fishtown.SR4 true diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index a1795b52..0bc6d380 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 120d72f0..2a5fbf0a 100644 --- a/spring-cloud-consul-config/pom.xml +++ b/spring-cloud-consul-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 2706bddb..dc66c700 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 8f5e2e03..bba540e9 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.8.BUILD-SNAPSHOT + 2.1.10.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 93dd153e..a502b816 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index d1f7879d..38c2bc73 100644 --- a/spring-cloud-consul-sample/pom.xml +++ b/spring-cloud-consul-sample/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 592ec86c..72a27303 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-all diff --git a/spring-cloud-starter-consul-bus/pom.xml b/spring-cloud-starter-consul-bus/pom.xml index bd6c6b73..ecfc4b38 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-bus diff --git a/spring-cloud-starter-consul-config/pom.xml b/spring-cloud-starter-consul-config/pom.xml index 55a3e457..7dd9b955 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-config diff --git a/spring-cloud-starter-consul-discovery/pom.xml b/spring-cloud-starter-consul-discovery/pom.xml index 980d6761..fc38c53f 100644 --- a/spring-cloud-starter-consul-discovery/pom.xml +++ b/spring-cloud-starter-consul-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index bf3b757e..30565054 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 2.1.4.BUILD-SNAPSHOT + 2.1.5.BUILD-SNAPSHOT .. spring-cloud-starter-consul From 4925757dc3ed15df46122800b889010118adf164 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Sun, 15 Dec 2019 11:26:58 -0500 Subject: [PATCH 4/5] Updates files property source test to new bootstrap properties format. --- ...ConsulPropertySourceLocatorFilesTests.java | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java index 4648c871..67d27510 100644 --- a/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java +++ b/spring-cloud-consul-config/src/test/java/org/springframework/cloud/consul/config/ConsulPropertySourceLocatorFilesTests.java @@ -16,8 +16,6 @@ package org.springframework.cloud.consul.config; -import java.util.Collection; -import java.util.Iterator; import java.util.UUID; import com.ecwid.consul.v1.ConsulClient; @@ -31,10 +29,8 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.consul.ConsulProperties; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; -import org.springframework.core.env.PropertySource; import org.springframework.test.annotation.DirtiesContext; import static org.assertj.core.api.Assertions.assertThat; @@ -109,35 +105,18 @@ public class ConsulPropertySourceLocatorFilesTests { assertThat(myBaz).as("my.baz was wrong").isEqualTo("bar-app-dev"); MutablePropertySources propertySources = this.environment.getPropertySources(); - PropertySource bootstrapProperties = propertySources - .get("bootstrapProperties"); - assertThat(bootstrapProperties).as("bootstrapProperties was null").isNotNull(); - assertThat(bootstrapProperties).as("bootstrapProperties was wrong type") - .isInstanceOf(CompositePropertySource.class); - Collection> consulSources = ((CompositePropertySource) bootstrapProperties) - .getPropertySources(); - assertThat(consulSources).as("consulSources was wrong size").hasSize(1); - - PropertySource consulSource = consulSources.iterator().next(); - assertThat(consulSource).as("consulSource was wrong type") - .isInstanceOf(CompositePropertySource.class); - Collection> fileSources = ((CompositePropertySource) consulSource) - .getPropertySources(); - assertThat(fileSources).as("fileSources was wrong size").hasSize(4); - - assertFileSourceNames(fileSources, APP_NAME_DEV_PROPS, APP_NAME_PROPS, - APPLICATION_DEV_YML, APPLICATION_YML); + assertFilePropertySourceExists(propertySources, APP_NAME_DEV_PROPS); + assertFilePropertySourceExists(propertySources, APP_NAME_PROPS); + assertFilePropertySourceExists(propertySources, APPLICATION_DEV_YML); + assertFilePropertySourceExists(propertySources, APPLICATION_YML); } - private void assertFileSourceNames(Collection> fileSources, - String... names) { - Iterator> iterator = fileSources.iterator(); - for (String name : names) { - PropertySource fileSource = iterator.next(); - assertThat(fileSource.getName()).as("fileSources was wrong name") - .endsWith(name); - } + private void assertFilePropertySourceExists(MutablePropertySources propertySources, + String name) { + boolean found = propertySources.stream() + .anyMatch(propertySource -> propertySource.getName().endsWith(name)); + assertThat(found).as("missing consul filesource: " + name).isTrue(); } @Configuration From 353de954dfb2922ec6357b6e70ff37be840c3e3a Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 14 Jan 2020 14:07:31 -0500 Subject: [PATCH 5/5] Makes RefreshEventData public. fixes gh-567 --- .../org/springframework/cloud/consul/config/ConfigWatch.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java index e7af113f..fef767c7 100644 --- a/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java +++ b/spring-cloud-consul-config/src/main/java/org/springframework/cloud/consul/config/ConfigWatch.java @@ -212,7 +212,7 @@ public class ConfigWatch implements ApplicationEventPublisherAware, SmartLifecyc this.firstTime = false; } - static class RefreshEventData { + public static class RefreshEventData { private final String context;