From ca9b92f98f057ba45b5712fc53fed4728ebe9e32 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 10 May 2016 14:53:25 -0600 Subject: [PATCH] Revert "Update SNAPSHOT to 1.0.0.RELEASE" This reverts commit c29a544409df650c02fbb2272a402e869ca851d5. --- README.adoc | 6 +++--- docs/pom.xml | 2 +- docs/src/main/asciidoc/README.adoc | 4 ++-- docs/src/main/asciidoc/spring-cloud-consul.adoc | 2 +- pom.xml | 4 ++-- spring-cloud-consul-bus/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 10 +++++----- 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 +- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.adoc b/README.adoc index cd923a6f..a1b8005a 100644 --- a/README.adoc +++ b/README.adoc @@ -36,9 +36,9 @@ See the https://consul.io/intro/index.html[intro] for more information. 1. Run `docker-compose up` 2. Verify consul is running by visiting http://localhost:8500 3. Run `mvn package` this will bring in the required spring cloud maven repositories and build -4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.RELEASE.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar` 5. visit http://localhost:8080, verify that `{"serviceId":":8080","host":"","port":8080}` results -6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.RELEASE.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081` 7. visit http://localhost:8080 again, verify that `{"serviceId":":8081","host":"","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so). == Building @@ -214,4 +214,4 @@ added after the original pull request but before a merge. other target branch in the main project). * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). + message (where XXXX is the issue number). \ No newline at end of file diff --git a/docs/pom.xml b/docs/pom.xml index 3f1e3a11..cc7b6ade 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT spring-cloud-consul-docs pom diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 6309a328..eb0dbfd6 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -27,9 +27,9 @@ See the https://consul.io/intro/index.html[intro] for more information. 1. Run `docker-compose up` 2. Verify consul is running by visiting http://localhost:8500 3. Run `mvn package` this will bring in the required spring cloud maven repositories and build -4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.RELEASE.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar` 5. visit http://localhost:8080, verify that `{"serviceId":":8080","host":"","port":8080}` results -6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.RELEASE.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.0.0.BUILD-SNAPSHOT.jar --server.port=8081` 7. visit http://localhost:8080 again, verify that `{"serviceId":":8081","host":"","port":8081}` eventually shows up in the results in a round robbin fashion (may take a minute or so). == Building diff --git a/docs/src/main/asciidoc/spring-cloud-consul.adoc b/docs/src/main/asciidoc/spring-cloud-consul.adoc index effe44ac..992f7f4c 100644 --- a/docs/src/main/asciidoc/spring-cloud-consul.adoc +++ b/docs/src/main/asciidoc/spring-cloud-consul.adoc @@ -308,4 +308,4 @@ public class Turbine { SpringApplication.run(DemoturbinecommonsApplication.class, args); } } ----- +---- \ No newline at end of file diff --git a/pom.xml b/pom.xml index 66cbd806..4592312f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 1.1.1.RELEASE + 1.1.0.RELEASE diff --git a/spring-cloud-consul-bus/pom.xml b/spring-cloud-consul-bus/pom.xml index 8babc88b..220f3990 100644 --- a/spring-cloud-consul-bus/pom.xml +++ b/spring-cloud-consul-bus/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index 2557fd3b..0b54a01a 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 - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index fbff05c9..fdf18bed 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 - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 3ea1a7ad..cfa6b1dc 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -5,18 +5,18 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.1.1.RELEASE + 1.1.0.RELEASE spring-cloud-consul-dependencies - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies - 1.1.0.RELEASE - 1.1.0.RELEASE - 1.1.0.RELEASE + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT + 1.1.0.BUILD-SNAPSHOT 1.1.9 2.3.1 4.5 diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 9daa3621..feb48c0d 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 - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 5fdbcc34..b8514c4f 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 - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index ff829a3e..0c60b43e 100644 --- a/spring-cloud-starter-consul-all/pom.xml +++ b/spring-cloud-starter-consul-all/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.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 84a705c4..b19b6bb2 100644 --- a/spring-cloud-starter-consul-bus/pom.xml +++ b/spring-cloud-starter-consul-bus/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.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 d0f3916b..543068dd 100644 --- a/spring-cloud-starter-consul-config/pom.xml +++ b/spring-cloud-starter-consul-config/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.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 7d3c2271..b448ff4e 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 - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul-discovery diff --git a/spring-cloud-starter-consul/pom.xml b/spring-cloud-starter-consul/pom.xml index fb7654b7..8c796540 100644 --- a/spring-cloud-starter-consul/pom.xml +++ b/spring-cloud-starter-consul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-consul - 1.0.0.RELEASE + 1.0.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul