Commit 3519ecf2 by Dave Syer

Prepare master for next snapshot

parent 72cecace
...@@ -5,13 +5,13 @@ ...@@ -5,13 +5,13 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>1.0.2.BUILD-SNAPSHOT</version> <version>1.0.3.BUILD-SNAPSHOT</version>
<relativePath /> <relativePath />
</parent> </parent>
<artifactId>spring-cloud-netflix-docs</artifactId> <artifactId>spring-cloud-netflix-docs</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Cloud Netflix Docs</name> <name>Spring Cloud Netflix Docs</name>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<description>Spring Cloud Docs</description> <description>Spring Cloud Docs</description>
<properties> <properties>
<docs.main>spring-cloud-netflix</docs.main> <docs.main>spring-cloud-netflix</docs.main>
......
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId> <artifactId>spring-cloud-build</artifactId>
<version>1.0.2.BUILD-SNAPSHOT</version> <version>1.0.3.BUILD-SNAPSHOT</version>
<relativePath /> <relativePath />
</parent> </parent>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Cloud Netflix</name> <name>Spring Cloud Netflix</name>
<description>Spring Cloud Netflix</description> <description>Spring Cloud Netflix</description>
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
</scm> </scm>
<properties> <properties>
<bintray.package>netflix</bintray.package> <bintray.package>netflix</bintray.package>
<spring-cloud-commons.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-commons.version> <spring-cloud-commons.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-config.version>1.0.2.BUILD-SNAPSHOT</spring-cloud-config.version> <spring-cloud-config.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-config.version>
<main.basedir>${basedir}</main.basedir> <main.basedir>${basedir}</main.basedir>
<archaius.version>0.6.5</archaius.version> <archaius.version>0.6.5</archaius.version>
<eureka.version>1.1.147</eureka.version> <eureka.version>1.1.147</eureka.version>
...@@ -83,87 +83,87 @@ ...@@ -83,87 +83,87 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId> <artifactId>spring-cloud-starter-eureka</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId> <artifactId>spring-cloud-starter-eureka-server</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-feign</artifactId> <artifactId>spring-cloud-starter-feign</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix</artifactId> <artifactId>spring-cloud-starter-hystrix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId> <artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId> <artifactId>spring-cloud-starter-ribbon</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-turbine</artifactId> <artifactId>spring-cloud-starter-turbine</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-turbine-amqp</artifactId> <artifactId>spring-cloud-starter-turbine-amqp</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul</artifactId> <artifactId>spring-cloud-starter-zuul</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId> <artifactId>spring-cloud-netflix-core</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-eureka-server</artifactId> <artifactId>spring-cloud-netflix-eureka-server</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId> <artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-hystrix-amqp</artifactId> <artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-sidecar</artifactId> <artifactId>spring-cloud-netflix-sidecar</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-turbine</artifactId> <artifactId>spring-cloud-netflix-turbine</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-turbine-amqp</artifactId> <artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-zuul-server</artifactId> <artifactId>spring-cloud-netflix-zuul-server</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.netflix.archaius</groupId> <groupId>com.netflix.archaius</groupId>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-cloud-netflix-core</artifactId> <artifactId>spring-cloud-netflix-core</artifactId>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-cloud-netflix-eureka-server</artifactId> <artifactId>spring-cloud-netflix-eureka-server</artifactId>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<url>http://projects.spring.io/spring-cloud/</url> <url>http://projects.spring.io/spring-cloud/</url>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<spring-cloud.version>1.0.3.BUILD-SNAPSHOT</spring-cloud.version> <spring-cloud.version>1.0.4.BUILD-SNAPSHOT</spring-cloud.version>
<wro4j.version>1.7.6</wro4j.version> <wro4j.version>1.7.6</wro4j.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository --> <relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>spring-cloud-netflix-hystrix-amqp</artifactId> <artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
<artifactId>spring-cloud-commons</artifactId> <artifactId>spring-cloud-commons</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId> <artifactId>spring-boot-starter-amqp</artifactId>
</dependency> </dependency>
......
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<spring-cloud.version>1.0.3.BUILD-SNAPSHOT</spring-cloud.version> <spring-cloud.version>1.0.4.BUILD-SNAPSHOT</spring-cloud.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-cloud-netflix-sidecar</artifactId> <artifactId>spring-cloud-netflix-sidecar</artifactId>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <!-- lookup parent from repository --> <relativePath>..</relativePath> <!-- lookup parent from repository -->
</parent> </parent>
<artifactId>spring-cloud-netflix-turbine-amqp</artifactId> <artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId> <artifactId>spring-cloud-netflix</artifactId>
<version>1.0.3.BUILD-SNAPSHOT</version> <version>1.0.4.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>
<artifactId>spring-cloud-netflix-turbine</artifactId> <artifactId>spring-cloud-netflix-turbine</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment