diff --git a/README.adoc b/README.adoc index a747848e..85b109d3 100644 --- a/README.adoc +++ b/README.adoc @@ -29,13 +29,15 @@ See the http://zookeeper.apache.org[Zookeeper site] for more information. Sprin 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.0.0.BUILD-SNAPSHOT.jar` +5. Run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.0.1.RELEASE.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.0.0.BUILD-SNAPSHOT.jar --server.port=8081` +7. run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.0.1.RELEASE.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). == Building +:jdkversion: 1.7 + === Basic Compile and Test To build the source you will need to install JDK {jdkversion}. @@ -94,24 +96,21 @@ If you don't have an IDE preference we would recommend that you use http://www.springsource.com/developer/sts[Spring Tools Suite] or http://eclipse.org[Eclipse] when working with the code. We use the http://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools -should also work without issue. +should also work without issue as long as they use Maven 3.3.3 or better. ==== Importing into eclipse with m2eclipse We recommend the http://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with eclipse. If you don't already have m2eclipse installed it is available from the "eclipse marketplace". -Unfortunately m2e does not yet support Maven 3.3, so once the projects -are imported into Eclipse you will also need to tell m2eclipse to use -the `.settings.xml` file for the projects. If you do not do this you -may see many different errors related to the POMs in the -projects. Open your Eclipse preferences, expand the Maven -preferences, and select User Settings. In the User Settings field -click Browse and navigate to the Spring Cloud project you imported -selecting the `.settings.xml` file in that project. Click Apply and -then OK to save the preference changes. - -NOTE: Alternatively you can copy the repository settings from https://github.com/spring-cloud/spring-cloud-build/blob/master/.settings.xml[`.settings.xml`] into your own `~/.m2/settings.xml`. +NOTE: Older versions of m2e do not support Maven 3.3, so once the +projects are imported into Eclipse you will also need to tell +m2eclipse to use the right profile for the projects. If you +see many different errors related to the POMs in the projects, check +that you have an up to date installation. If you can't upgrade m2e, +add the "spring" profile to your `settings.xml`. Alternatively you can +copy the repository settings from the "spring" profile of the parent +pom into your `settings.xml`. ==== Importing into eclipse without m2eclipse If you prefer not to use m2eclipse you can generate eclipse project metadata using the @@ -125,6 +124,7 @@ following command: The generated eclipse projects can be imported by selecting `import existing projects` from the `file` menu. + == Contributing Spring Cloud is released under the non-restrictive Apache 2.0 license, diff --git a/docs/pom.xml b/docs/pom.xml index 22dac0ee..3fb81bc1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE spring-cloud-zookeeper-docs pom diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 30104bcb..d55d127b 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -20,14 +20,14 @@ See the http://zookeeper.apache.org[Zookeeper site] for more information. Sprin 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.0.0.BUILD-SNAPSHOT.jar` +5. Run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.0.1.RELEASE.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.0.0.BUILD-SNAPSHOT.jar --server.port=8081` +7. run `java -jar spring-cloud-zookeeper-sample/target/spring-cloud-zookeeper-sample-1.0.1.RELEASE.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). == Building -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-base-no-lombok.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[] == Contributing diff --git a/pom.xml b/pom.xml index f2ae0de1..3ec39510 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-zookeeper - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE pom Spring Cloud Zookeeper Spring Cloud Zookeeper @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.1.2.BUILD-SNAPSHOT + 1.1.1.RELEASE @@ -183,7 +183,7 @@ 2.17 - 1.1.1.BUILD-SNAPSHOT + 1.1.1.RELEASE diff --git a/spring-cloud-starter-zookeeper-all/pom.xml b/spring-cloud-starter-zookeeper-all/pom.xml index 4b688872..db45297f 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.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 cb972d92..b271bf37 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.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 905a3166..dc918a99 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE .. spring-cloud-starter-zookeeper-discovery diff --git a/spring-cloud-starter-zookeeper/pom.xml b/spring-cloud-starter-zookeeper/pom.xml index 015b1155..9e7cb6b3 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE .. spring-cloud-starter-zookeeper diff --git a/spring-cloud-zookeeper-config/pom.xml b/spring-cloud-zookeeper-config/pom.xml index f4343863..5c4032ae 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE .. diff --git a/spring-cloud-zookeeper-core/pom.xml b/spring-cloud-zookeeper-core/pom.xml index 77100cf2..6f9c3f83 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE .. diff --git a/spring-cloud-zookeeper-dependencies/pom.xml b/spring-cloud-zookeeper-dependencies/pom.xml index 74cf284a..360e1db1 100644 --- a/spring-cloud-zookeeper-dependencies/pom.xml +++ b/spring-cloud-zookeeper-dependencies/pom.xml @@ -5,18 +5,18 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.2.BUILD-SNAPSHOT + 1.1.1.RELEASE spring-cloud-zookeeper-dependencies - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE pom spring-cloud-zookeeper-dependencies Spring Cloud Zookeeper Dependencies - 1.0.1.BUILD-SNAPSHOT - 1.1.1.BUILD-SNAPSHOT - 1.1.1.BUILD-SNAPSHOT + 1.0.1.RELEASE + 1.1.1.RELEASE + 1.1.1.RELEASE 2.10.0 diff --git a/spring-cloud-zookeeper-discovery/pom.xml b/spring-cloud-zookeeper-discovery/pom.xml index fda5e2a6..a9fc0394 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE .. diff --git a/spring-cloud-zookeeper-sample/pom.xml b/spring-cloud-zookeeper-sample/pom.xml index d24d239e..10ea8a36 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 - 1.0.1.BUILD-SNAPSHOT + 1.0.1.RELEASE ..