From 0f64aed86a7b081dee791427dd1af1e898f75e39 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 20:22:50 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 2.2.2.RELEASE --- README.adoc | 5 +++++ docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 ++ pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 13 files changed, 25 insertions(+), 18 deletions(-) diff --git a/README.adoc b/README.adoc index 26dda61a..33c54b81 100644 --- a/README.adoc +++ b/README.adoc @@ -143,6 +143,11 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. +==== Activate the Spring Maven profile +Spring Cloud projects require the 'spring' Maven profile to be activated to resolve +the spring milestone and snapshot repositories. Use your preferred IDE to set this +profile to be active, or you may experience build errors. + ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index 56354294..2746587d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE spring-cloud-zookeeper-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 5496309e..9c7d3007 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -5,6 +5,7 @@ |spring.cloud.zookeeper.block-until-connected-unit | | The unit of time related to blocking on connection to Zookeeper. |spring.cloud.zookeeper.block-until-connected-wait | 10 | Wait time to block on connection to Zookeeper. |spring.cloud.zookeeper.connect-string | localhost:2181 | Connection string to the Zookeeper cluster. +|spring.cloud.zookeeper.connection-timeout | | The configured connection timeout in milliseconds. |spring.cloud.zookeeper.default-health-endpoint | | Default health endpoint that will be checked to verify that a dependency is alive. |spring.cloud.zookeeper.dependencies | | Mapping of alias to ZookeeperDependency. From Ribbon perspective the alias is actually serviceID since Ribbon can't accept nested structures in serviceID. |spring.cloud.zookeeper.dependency-configurations | | @@ -24,5 +25,6 @@ |spring.cloud.zookeeper.max-retries | 10 | Max number of times to retry. |spring.cloud.zookeeper.max-sleep-ms | 500 | Max time in ms to sleep on each retry. |spring.cloud.zookeeper.prefix | | Common prefix that will be applied to all Zookeeper dependencies' paths. +|spring.cloud.zookeeper.session-timeout | | The configured/negotiated session timeout in milliseconds. Please refer to Curator's Tech Note 14 to understand how Curator implements connection sessions. @see Curator's Tech Note 14 |=== diff --git a/pom.xml b/pom.xml index 060bbbc9..c9ac6400 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE @@ -177,11 +177,11 @@ - 2.3.0.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.3.0.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE + 2.2.3.RELEASE diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 0f8e910b..fc970143 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index a1238b17..f8c2d417 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index a5608b65..9638d66b 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index f67fb5dd..7d94acb5 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index a311e6c6..35009889 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index cfc1d91c..b58b1724 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index fd838442..ade95893 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE spring-cloud-zookeeper-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index e1b3b65d..25eb8616 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 15beed74..65de04a9 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.2.RELEASE .. From b6d8a345c1cceefc52246048cb1f496264b5058e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 20:27:04 +0000 Subject: [PATCH 2/4] Going back to snapshots --- README.adoc | 5 ----- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 -- pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 13 files changed, 18 insertions(+), 25 deletions(-) diff --git a/README.adoc b/README.adoc index 33c54b81..26dda61a 100644 --- a/README.adoc +++ b/README.adoc @@ -143,11 +143,6 @@ https://eclipse.org[Eclipse] when working with the code. We use the https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools should also work without issue as long as they use Maven 3.3.3 or better. -==== Activate the Spring Maven profile -Spring Cloud projects require the 'spring' Maven profile to be activated to resolve -the spring milestone and snapshot repositories. Use your preferred IDE to set this -profile to be active, or you may experience build errors. - ==== Importing into eclipse with m2eclipse We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse diff --git a/docs/pom.xml b/docs/pom.xml index 2746587d..56354294 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT spring-cloud-zookeeper-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 9c7d3007..5496309e 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -5,7 +5,6 @@ |spring.cloud.zookeeper.block-until-connected-unit | | The unit of time related to blocking on connection to Zookeeper. |spring.cloud.zookeeper.block-until-connected-wait | 10 | Wait time to block on connection to Zookeeper. |spring.cloud.zookeeper.connect-string | localhost:2181 | Connection string to the Zookeeper cluster. -|spring.cloud.zookeeper.connection-timeout | | The configured connection timeout in milliseconds. |spring.cloud.zookeeper.default-health-endpoint | | Default health endpoint that will be checked to verify that a dependency is alive. |spring.cloud.zookeeper.dependencies | | Mapping of alias to ZookeeperDependency. From Ribbon perspective the alias is actually serviceID since Ribbon can't accept nested structures in serviceID. |spring.cloud.zookeeper.dependency-configurations | | @@ -25,6 +24,5 @@ |spring.cloud.zookeeper.max-retries | 10 | Max number of times to retry. |spring.cloud.zookeeper.max-sleep-ms | 500 | Max time in ms to sleep on each retry. |spring.cloud.zookeeper.prefix | | Common prefix that will be applied to all Zookeeper dependencies' paths. -|spring.cloud.zookeeper.session-timeout | | The configured/negotiated session timeout in milliseconds. Please refer to Curator's Tech Note 14 to understand how Curator implements connection sessions. @see Curator's Tech Note 14 |=== diff --git a/pom.xml b/pom.xml index c9ac6400..060bbbc9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT @@ -177,11 +177,11 @@ - 2.3.0.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE - 2.2.3.RELEASE + 2.3.0.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index fc970143..0f8e910b 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index f8c2d417..a1238b17 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 9638d66b..a5608b65 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 7d94acb5..f67fb5dd 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 35009889..a311e6c6 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index b58b1724..cfc1d91c 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index ade95893..fd838442 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.RELEASE + 2.3.0.BUILD-SNAPSHOT spring-cloud-zookeeper-dependencies - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index 25eb8616..e1b3b65d 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 65de04a9..15beed74 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.RELEASE + 2.2.2.BUILD-SNAPSHOT .. From b522a5ec1429e9bbf3e2334a7a11cee12d48159e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 May 2020 20:27:04 +0000 Subject: [PATCH 3/4] Bumping versions to 2.2.3.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 14 +++++++------- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- spring-cloud-starter-zookeeper-discovery/pom.xml | 2 +- spring-cloud-starter-zookeeper/pom.xml | 2 +- spring-cloud-zookeeper-config/pom.xml | 2 +- spring-cloud-zookeeper-core/pom.xml | 2 +- spring-cloud-zookeeper-dependencies/pom.xml | 4 ++-- spring-cloud-zookeeper-discovery/pom.xml | 2 +- spring-cloud-zookeeper-sample/pom.xml | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 56354294..2d166de2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT spring-cloud-zookeeper-docs pom diff --git a/pom.xml b/pom.xml index 060bbbc9..01750b3f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.0.BUILD-SNAPSHOT + 2.3.0.RELEASE @@ -177,11 +177,11 @@ - 2.3.0.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT - 2.2.3.BUILD-SNAPSHOT + 2.3.0.RELEASE + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 0f8e910b..3c499b92 100644 --- a/spring-cloud-starter-zookeeper-all/pom.xml +++ b/spring-cloud-starter-zookeeper-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index a1238b17..7dfc46d1 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index a5608b65..6a0e9c41 100644 --- a/spring-cloud-starter-zookeeper-discovery/pom.xml +++ b/spring-cloud-starter-zookeeper-discovery/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index f67fb5dd..8476b497 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index a311e6c6..430b796e 100644 --- a/spring-cloud-zookeeper-config/pom.xml +++ b/spring-cloud-zookeeper-config/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index cfc1d91c..15e8b8ab 100644 --- a/spring-cloud-zookeeper-core/pom.xml +++ b/spring-cloud-zookeeper-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index fd838442..7781da46 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.0.BUILD-SNAPSHOT + 2.3.1.BUILD-SNAPSHOT spring-cloud-zookeeper-dependencies - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index e1b3b65d..622b52ff 100644 --- a/spring-cloud-zookeeper-discovery/pom.xml +++ b/spring-cloud-zookeeper-discovery/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 15beed74..80fc5365 100644 --- a/spring-cloud-zookeeper-sample/pom.xml +++ b/spring-cloud-zookeeper-sample/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.2.2.BUILD-SNAPSHOT + 2.2.3.BUILD-SNAPSHOT .. From 17e31f524128ff1858aa1add318fcb81c2625ce8 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 3 Jun 2020 10:56:16 -0400 Subject: [PATCH 4/4] spring-cloud-starter-zookeeper now depends on spring-cloud-starter This brings in spring-boot-starter and spring-cloud-context. Fixes gh-248 --- spring-cloud-starter-zookeeper-config/pom.xml | 4 ---- spring-cloud-starter-zookeeper/pom.xml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index 7dfc46d1..0cf0406d 100644 --- a/spring-cloud-starter-zookeeper-config/pom.xml +++ b/spring-cloud-starter-zookeeper-config/pom.xml @@ -28,10 +28,6 @@ org.springframework.cloud spring-cloud-zookeeper-config - - org.springframework.cloud - spring-cloud-context - org.apache.curator curator-recipes diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 8476b497..c305a38d 100644 --- a/spring-cloud-starter-zookeeper/pom.xml +++ b/spring-cloud-starter-zookeeper/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-commons + spring-cloud-starter org.springframework.cloud