From 5b45629063be5f02ceba09ccd52313c410fa6a42 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 27 Jan 2017 14:30:37 -0700 Subject: [PATCH] Revert "Update SNAPSHOT to 1.2.0.M1" This reverts commit 01321d78bd436e2aa4cf7f31dd66ca27fbe3a4f4. --- README.adoc | 6 +++--- docs/pom.xml | 2 +- docs/src/main/asciidoc/README.adoc | 4 ++-- pom.xml | 16 ++++++++-------- spring-cloud-consul-binder/pom.xml | 2 +- spring-cloud-consul-config/pom.xml | 2 +- spring-cloud-consul-core/pom.xml | 2 +- spring-cloud-consul-dependencies/pom.xml | 4 ++-- 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 +- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.adoc b/README.adoc index 3517efc6..40b32ad1 100644 --- a/README.adoc +++ b/README.adoc @@ -37,9 +37,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.2.0.M1.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.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.2.0.M1.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.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 @@ -212,4 +212,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). \ No newline at end of file + message (where XXXX is the issue number). diff --git a/docs/pom.xml b/docs/pom.xml index d777303e..a7cbf26c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.0.M1 + 1.2.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 3f8f85c5..bfd11bc7 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -28,9 +28,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.2.0.M1.jar` +4. Run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.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.2.0.M1.jar --server.port=8081` +6. run `java -jar spring-cloud-consul-sample/target/spring-cloud-consul-sample-1.2.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/pom.xml b/pom.xml index a7ee7cd0..ded4e59f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.0.M1 + 1.2.0.BUILD-SNAPSHOT pom Spring Cloud Consul Spring Cloud Consul @@ -14,18 +14,18 @@ org.springframework.cloud spring-cloud-build - 1.3.1.M1 + 1.3.1.BUILD-SNAPSHOT - 1.3.0.M1 - 1.2.0.M1 - 1.3.0.M2 - 1.3.0.M1 - 1.0.3.RELEASE - Chelsea.M1 + 1.3.0.BUILD-SNAPSHOT + 1.2.0.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT + 1.3.0.BUILD-SNAPSHOT + 1.0.3.BUILD-SNAPSHOT + Chelsea.BUILD-SNAPSHOT diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index c660e167..442a38f2 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-consul - 1.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-config/pom.xml b/spring-cloud-consul-config/pom.xml index e115d0bf..63a5ab08 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.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index f370f087..e19c57eb 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.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index cde04614..bb76caf5 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.1.M1 + 1.3.1.BUILD-SNAPSHOT spring-cloud-consul-dependencies - 1.2.0.M1 + 1.2.0.BUILD-SNAPSHOT pom spring-cloud-consul-dependencies Spring Cloud Consul Dependencies diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index e8b84ab4..af4b4751 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.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-consul-sample/pom.xml b/spring-cloud-consul-sample/pom.xml index 63e83d92..6610dfee 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.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-consul-all/pom.xml b/spring-cloud-starter-consul-all/pom.xml index 93e6dcce..89230945 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.2.0.M1 + 1.2.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 2b0863d3..d72b706c 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.2.0.M1 + 1.2.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 f415360a..4190d601 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.2.0.M1 + 1.2.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 ab456037..8caada56 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.2.0.M1 + 1.2.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 4df8c6a7..3fe60ad8 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.2.0.M1 + 1.2.0.BUILD-SNAPSHOT .. spring-cloud-starter-consul