From 92ca2325188a3852ed2df79166cd68591bd4e61b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 14:58:47 +0000 Subject: [PATCH 1/5] Update SNAPSHOT to 1.3.3.RELEASE --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 66f5d56a..7934b347 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 14c8c492..0eb99868 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE pom Spring Cloud Commons Parent Spring Cloud Commons Parent diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 053df5e4..72a4ffcf 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.BUILD-SNAPSHOT + 1.3.8.RELEASE spring-cloud-commons-dependencies - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index ba11f0d7..2ac674ca 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. spring-cloud-commons diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 1cc99e58..38e9820c 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. spring-cloud-context diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 4da17ff3..ca30ecef 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE spring-cloud-starter spring-cloud-starter From 7219560a1fea1b8ed8a4d230acfde4d1d7bc58b7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 15:04:09 +0000 Subject: [PATCH 2/5] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-commons-dependencies/pom.xml | 4 ++-- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 7934b347..66f5d56a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 0eb99868..14c8c492 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 72a4ffcf..053df5e4 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.RELEASE + 1.3.8.BUILD-SNAPSHOT spring-cloud-commons-dependencies - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index 2ac674ca..ba11f0d7 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 38e9820c..1cc99e58 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index ca30ecef..4da17ff3 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter From f71e5a3eaf2042dd241ecfad31e10f13bf458f2f Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 15:04:10 +0000 Subject: [PATCH 3/5] Bumping versions to 1.3.4.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-commons-dependencies/pom.xml | 2 +- spring-cloud-commons/pom.xml | 2 +- spring-cloud-context/pom.xml | 2 +- spring-cloud-starter/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 66f5d56a..86e8723a 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT pom Spring Cloud Commons Docs diff --git a/pom.xml b/pom.xml index 14c8c492..7d2886dc 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT pom Spring Cloud Commons Parent Spring Cloud Commons Parent diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 053df5e4..cd89d5f5 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-commons-dependencies - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT pom spring-cloud-commons-dependencies Spring Cloud Commons Dependencies diff --git a/spring-cloud-commons/pom.xml b/spring-cloud-commons/pom.xml index ba11f0d7..c091e904 100644 --- a/spring-cloud-commons/pom.xml +++ b/spring-cloud-commons/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-commons diff --git a/spring-cloud-context/pom.xml b/spring-cloud-context/pom.xml index 1cc99e58..b400a1b9 100644 --- a/spring-cloud-context/pom.xml +++ b/spring-cloud-context/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-context diff --git a/spring-cloud-starter/pom.xml b/spring-cloud-starter/pom.xml index 4da17ff3..8f635929 100644 --- a/spring-cloud-starter/pom.xml +++ b/spring-cloud-starter/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-commons-parent - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT spring-cloud-starter spring-cloud-starter From b8c60382545ebdd82a08f0f4514f955330cc8836 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 14 May 2018 13:27:57 -0400 Subject: [PATCH 4/5] Fixes #359 --- docs/src/main/asciidoc/spring-cloud-commons.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index eb01aaf7..4cc98344 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -527,7 +527,7 @@ spring: You can also force to use only specified network addresses using list of regular expressions: -.application.yml +.bootstrap.yml ---- spring: cloud: From 88d34390350d55c79e4c6437092a0224acf7381e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 Jun 2018 14:11:16 -0400 Subject: [PATCH 5/5] Clarify ServiceRegistry documentation. Fixes #361. --- docs/src/main/asciidoc/spring-cloud-commons.adoc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-commons.adoc b/docs/src/main/asciidoc/spring-cloud-commons.adoc index 4cc98344..54546351 100644 --- a/docs/src/main/asciidoc/spring-cloud-commons.adoc +++ b/docs/src/main/asciidoc/spring-cloud-commons.adoc @@ -349,6 +349,14 @@ public class MyConfiguration { Each `ServiceRegistry` implementation has its own `Registry` implementation. +* `ZookeeperRegistration` used with `ZookeeperServiceRegistry` +* `EurekaRegistration` used with `EurekaServiceRegistry` +* `ConsulRegistration` used with `ConsulServiceRegistry` + +If you are using the `ServiceRegistry` interface, you are going to need to pass the +correct `Registry` implementation for the `ServiceRegistry` implementation you +are using. + ==== ServiceRegistry Auto-Registration