From 4abb12f1729374486cab634df2e514f7c5ec6f5e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 21 Sep 2018 23:24:18 +0000 Subject: [PATCH] Update SNAPSHOT to Greenwich.M1 --- README.adoc | 52 +++++++++++-------- docs/pom.xml | 2 +- pom.xml | 14 ++--- spring-cloud-starter-zookeeper-all/pom.xml | 2 +- spring-cloud-starter-zookeeper-config/pom.xml | 2 +- .../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 +- 12 files changed, 47 insertions(+), 41 deletions(-) diff --git a/README.adoc b/README.adoc index 7ca970c9..492db689 100644 --- a/README.adoc +++ b/README.adoc @@ -2,37 +2,43 @@ image::https://travis-ci.org/spring-cloud/spring-cloud-zookeeper.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-zookeeper] -This project provides Zookeeper integrations for Spring Boot apps through autoconfiguration -and binding to the Spring Environment and other Spring programming model idioms. With a few -simple annotations you can quickly enable and configure the common patterns inside your -application and build large distributed systems with Zookeeper based components. The -patterns provided include Service Discovery and Configuration. -Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon), Circuit Breaker -(Hystrix) are provided by integration with Spring Cloud Netflix. - +This project provides Zookeeper integrations for Spring Boot applications through +autoconfiguration and binding to the Spring Environment and other Spring programming model +idioms. With a few annotations, you can quickly enable and configure the common patterns +inside your application and build large distributed systems with Zookeeper based +components. The provided patterns include Service Discovery and Configuration. Integration +with Spring Cloud Netflix provides Intelligent Routing (Zuul), Client Side Load Balancing +(Ribbon), and Circuit Breaker (Hystrix). == Zookeeper overview -"ZooKeeper is a centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services." - -See the http://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper also builds on the http://curator.apache.org[Apache Curator] project which started life at Netflix. +ZooKeeper is a centralized service for maintaining configuration information, naming, +providing distributed synchronization, and providing group services. See the +http://zookeeper.apache.org[Zookeeper site] for more information. Spring Cloud Zookeeper +also builds on the http://curator.apache.org[Apache Curator] project, which started life +at Netflix. == Spring Cloud Zookeeper Features -* Spring Cloud `DiscoveryClient` implementation -** supports Ribbon and Zuul -* Zookeeper based `PropertySource` loaded during the 'bootstrap' phase. +Spring Cloud Zookeeper includes the following features: -== Running the sample +* Spring Cloud `DiscoveryClient` implementation (supports Ribbon and Zuul) +* Zookeeper-based `PropertySource` loaded during the 'bootstrap' phase -1. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install zookeeper] (On a mac with homebrew `brew install zookeeper`). -2. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start zookeeper]. -3. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify zookeeper is running]. -4. Run `mvn --settings .settings.xml package` this will bring in the required spring cloud maven repositories and build -5. Run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.2.0.BUILD-SNAPSHOT.jar` -6. Visit http://localhost:8080, verify that `{"serviceId":"testZookeeperApp","host":"","port":8080}` results -7. run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.2.0.BUILD-SNAPSHOT.jar --server.port=8081` -8. visit http://localhost:8080 again, verify that `{"serviceId":"testZookeeperApp","host":"","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so). +== Running the Sample + +. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_Download[Install +zookeeper] (On a mac with homebrew, use `brew install zookeeper`). +. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_InstallingSingleMode[Start +zookeeper]. +. http://zookeeper.apache.org/doc/current/zookeeperStarted.html#sc_ConnectingToZooKeeper[Verify +zookeeper is running]. +. Run `mvn --settings .settings.xml package`. +Doing so brings in the required Spring Cloud Maven repositories and Build. +. Run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.2.0.BUILD-SNAPSHOT.jar`. +. Visit http://localhost:8080 to verify that `{"serviceId":"testZookeeperApp","host":"","port":8080}` works. +. Run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.2.0.BUILD-SNAPSHOT.jar --server.port=8081` +. Visit http://localhost:8080 again to verify that `{"serviceId":"testZookeeperApp","host":"","port":8081}` eventually shows up in the results in a round-robin fashion. (It may take a minute or so.) == Building diff --git a/docs/pom.xml b/docs/pom.xml index 300c2ae2..469489c2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.1.0.BUILD-SNAPSHOT + 2.1.0.M1 spring-cloud-zookeeper-docs pom diff --git a/pom.xml b/pom.xml index 8d1e6750..472a530d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 2.1.0.BUILD-SNAPSHOT + 2.1.0.M1 pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.1.0.BUILD-SNAPSHOT + 2.1.0.M2 @@ -223,11 +223,11 @@ 2.17 - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT + 2.1.0.M2 + 2.1.0.M1 + 2.1.0.M1 + 2.1.0.M1 + 2.1.0.M1 diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 5641e1cc..17b69495 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. spring-cloud-starter-zookeeper-all diff --git a/spring-cloud-starter-zookeeper-config/pom.xml b/spring-cloud-starter-zookeeper-config/pom.xml index df9f991d..49dc475d 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. spring-cloud-starter-zookeeper-config diff --git a/spring-cloud-starter-zookeeper-discovery/pom.xml b/spring-cloud-starter-zookeeper-discovery/pom.xml index 1e7edb43..4a3b1e41 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 71506106..c26bbb93 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index 5915adfc..9abc3482 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 14f48ee4..1548a0c9 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 3a52150e..6cb45769 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.1.0.BUILD-SNAPSHOT + 2.1.0.M2 spring-cloud-zookeeper-dependencies - 2.1.0.BUILD-SNAPSHOT + 2.1.0.M1 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 45c4f7a9..e732708e 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index 0e6c98da..3713c237 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.1.0.BUILD-SNAPSHOT + 2.1.0.M1 ..