From 05f75e70dae7b976450f6e3be72254cf367397c5 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 17 Nov 2015 12:27:01 +0000 Subject: [PATCH] Update to 1.1.0.M3 --- README.adoc | 6 ++---- docs/pom.xml | 4 ++-- pom.xml | 16 ++++++++-------- spring-cloud-netflix-core/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 4 ++-- spring-cloud-netflix-hystrix-amqp/pom.xml | 2 +- spring-cloud-netflix-hystrix-dashboard/pom.xml | 4 ++-- spring-cloud-netflix-hystrix-stream/pom.xml | 2 +- spring-cloud-netflix-sidecar/pom.xml | 2 +- spring-cloud-netflix-spectator/pom.xml | 2 +- spring-cloud-netflix-turbine-stream/pom.xml | 2 +- spring-cloud-netflix-turbine/pom.xml | 2 +- spring-cloud-starter-atlas/pom.xml | 2 +- spring-cloud-starter-eureka-server/pom.xml | 2 +- spring-cloud-starter-eureka/pom.xml | 2 +- spring-cloud-starter-feign/pom.xml | 2 +- spring-cloud-starter-hystrix-dashboard/pom.xml | 2 +- spring-cloud-starter-hystrix/pom.xml | 2 +- spring-cloud-starter-ribbon/pom.xml | 2 +- spring-cloud-starter-spectator/pom.xml | 2 +- spring-cloud-starter-turbine-amqp/pom.xml | 2 +- spring-cloud-starter-turbine-stream/pom.xml | 2 +- spring-cloud-starter-turbine/pom.xml | 2 +- spring-cloud-starter-zuul/pom.xml | 2 +- 24 files changed, 35 insertions(+), 37 deletions(-) diff --git a/README.adoc b/README.adoc index c95d15cf..a070d6bd 100644 --- a/README.adoc +++ b/README.adoc @@ -64,10 +64,8 @@ https://github.com/spring-cloud-samples/scripts[scripts demo repository] for specific instructions about the common cases of mongo, rabbit and redis. -NOTE: migration to the Maven wrapper (`./mvnw`) is underway. If you -find a project that doesn't have it yet, raise an issue to get it -added, and build with the command from `.travis.yml` (usually -`mvn install -s .settings.xml`). +NOTE: If all else fails, build with the command from `.travis.yml` (usually +`./mvnw install`). === Documentation diff --git a/docs/pom.xml b/docs/pom.xml index 555c228f..cb04fa50 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,13 +5,13 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 spring-cloud-netflix-docs pom Spring Cloud Netflix Docs - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 Spring Cloud Docs spring-cloud-netflix diff --git a/pom.xml b/pom.xml index 047b1aec..23c406f2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-build - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 pom Spring Cloud Netflix Spring Cloud Netflix @@ -21,9 +21,9 @@ netflix - 1.1.0.BUILD-SNAPSHOT - 1.1.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT + 1.1.0.M3 + 1.1.0.M3 + 1.0.0.M2 ${basedir} 0.6.5 1.3.4 @@ -86,7 +86,7 @@ org.springframework.cloud spring-cloud-starter-atlas - 1.1.0.BUILD-SNAPSHOT + ${project.version} org.springframework.cloud @@ -121,7 +121,7 @@ org.springframework.cloud spring-cloud-starter-spectator - 1.1.0.BUILD-SNAPSHOT + ${project.version} org.springframework.cloud @@ -166,7 +166,7 @@ org.springframework.cloud spring-cloud-netflix-spectator - 1.1.0.BUILD-SNAPSHOT + ${project.version} org.springframework.cloud diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml index ed1623a4..ef962351 100644 --- a/spring-cloud-netflix-core/pom.xml +++ b/spring-cloud-netflix-core/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-core diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index b7ee0ce4..ead120c3 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-eureka-server @@ -13,7 +13,7 @@ http://projects.spring.io/spring-cloud/ ${basedir}/.. - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 1.7.9 diff --git a/spring-cloud-netflix-hystrix-amqp/pom.xml b/spring-cloud-netflix-hystrix-amqp/pom.xml index 1dac93b9..eee9623c 100644 --- a/spring-cloud-netflix-hystrix-amqp/pom.xml +++ b/spring-cloud-netflix-hystrix-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-hystrix-amqp diff --git a/spring-cloud-netflix-hystrix-dashboard/pom.xml b/spring-cloud-netflix-hystrix-dashboard/pom.xml index 7ba0cf19..19380558 100644 --- a/spring-cloud-netflix-hystrix-dashboard/pom.xml +++ b/spring-cloud-netflix-hystrix-dashboard/pom.xml @@ -8,12 +8,12 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. ${basedir}/.. - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 diff --git a/spring-cloud-netflix-hystrix-stream/pom.xml b/spring-cloud-netflix-hystrix-stream/pom.xml index c12d2daa..1b678611 100644 --- a/spring-cloud-netflix-hystrix-stream/pom.xml +++ b/spring-cloud-netflix-hystrix-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-hystrix-stream diff --git a/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud-netflix-sidecar/pom.xml index a03b3d13..ba907817 100644 --- a/spring-cloud-netflix-sidecar/pom.xml +++ b/spring-cloud-netflix-sidecar/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-sidecar diff --git a/spring-cloud-netflix-spectator/pom.xml b/spring-cloud-netflix-spectator/pom.xml index b4af7b3e..62a59086 100644 --- a/spring-cloud-netflix-spectator/pom.xml +++ b/spring-cloud-netflix-spectator/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-spectator diff --git a/spring-cloud-netflix-turbine-stream/pom.xml b/spring-cloud-netflix-turbine-stream/pom.xml index af414867..2d4eb4c5 100644 --- a/spring-cloud-netflix-turbine-stream/pom.xml +++ b/spring-cloud-netflix-turbine-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-turbine-stream diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index 4fa0583b..41da2c81 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-netflix-turbine diff --git a/spring-cloud-starter-atlas/pom.xml b/spring-cloud-starter-atlas/pom.xml index 497f68ef..43f84f71 100644 --- a/spring-cloud-starter-atlas/pom.xml +++ b/spring-cloud-starter-atlas/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-atlas diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml index bb650d39..773789e0 100644 --- a/spring-cloud-starter-eureka-server/pom.xml +++ b/spring-cloud-starter-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-eureka-server diff --git a/spring-cloud-starter-eureka/pom.xml b/spring-cloud-starter-eureka/pom.xml index 25f86ccd..16a28662 100644 --- a/spring-cloud-starter-eureka/pom.xml +++ b/spring-cloud-starter-eureka/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-eureka diff --git a/spring-cloud-starter-feign/pom.xml b/spring-cloud-starter-feign/pom.xml index d54d1cdd..a07fc305 100644 --- a/spring-cloud-starter-feign/pom.xml +++ b/spring-cloud-starter-feign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-feign diff --git a/spring-cloud-starter-hystrix-dashboard/pom.xml b/spring-cloud-starter-hystrix-dashboard/pom.xml index 557594ba..1fb7c7f1 100644 --- a/spring-cloud-starter-hystrix-dashboard/pom.xml +++ b/spring-cloud-starter-hystrix-dashboard/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-hystrix-dashboard diff --git a/spring-cloud-starter-hystrix/pom.xml b/spring-cloud-starter-hystrix/pom.xml index ad30d4e3..45cb1bbb 100644 --- a/spring-cloud-starter-hystrix/pom.xml +++ b/spring-cloud-starter-hystrix/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-hystrix diff --git a/spring-cloud-starter-ribbon/pom.xml b/spring-cloud-starter-ribbon/pom.xml index e984ca67..bce48fd0 100644 --- a/spring-cloud-starter-ribbon/pom.xml +++ b/spring-cloud-starter-ribbon/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-ribbon diff --git a/spring-cloud-starter-spectator/pom.xml b/spring-cloud-starter-spectator/pom.xml index fc4b7195..79d9de8e 100644 --- a/spring-cloud-starter-spectator/pom.xml +++ b/spring-cloud-starter-spectator/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-spectator diff --git a/spring-cloud-starter-turbine-amqp/pom.xml b/spring-cloud-starter-turbine-amqp/pom.xml index 99fbbb19..7f5faf20 100644 --- a/spring-cloud-starter-turbine-amqp/pom.xml +++ b/spring-cloud-starter-turbine-amqp/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-turbine-amqp diff --git a/spring-cloud-starter-turbine-stream/pom.xml b/spring-cloud-starter-turbine-stream/pom.xml index 8195f900..8299a86b 100644 --- a/spring-cloud-starter-turbine-stream/pom.xml +++ b/spring-cloud-starter-turbine-stream/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-turbine-stream diff --git a/spring-cloud-starter-turbine/pom.xml b/spring-cloud-starter-turbine/pom.xml index 9ba20758..052b34c2 100644 --- a/spring-cloud-starter-turbine/pom.xml +++ b/spring-cloud-starter-turbine/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-turbine diff --git a/spring-cloud-starter-zuul/pom.xml b/spring-cloud-starter-zuul/pom.xml index a99c1892..7f36e21e 100644 --- a/spring-cloud-starter-zuul/pom.xml +++ b/spring-cloud-starter-zuul/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 1.1.0.BUILD-SNAPSHOT + 1.1.0.M3 .. spring-cloud-starter-zuul