Update netflix dependencies to 1.0.2

Also use <properties/> to specify all starter depdendency versions
so users can override them.
This commit is contained in:
Dave Syer
2015-04-30 12:10:52 +02:00
parent a55246b152
commit 629c4addec
11 changed files with 60 additions and 57 deletions

View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-docs</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-eureka-server</artifactId>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-eureka</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-feign</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-hystrix</artifactId>

View File

@@ -8,6 +8,7 @@
<version>1.0.1.RELEASE</version>
</parent>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.2.RELEASE</version>
<name>spring-cloud-starter-parent</name>
<description>Spring Cloud Starter</description>
<packaging>pom</packaging>
@@ -18,78 +19,79 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<spring-cloud-aws.version>1.0.1.RELEASE</spring-cloud-aws.version>
<spring-cloud-bus.version>1.0.1.RELEASE</spring-cloud-bus.version>
<spring-cloud-commons.version>1.0.1.RELEASE</spring-cloud-commons.version>
<spring-cloud-config.version>1.0.1.RELEASE</spring-cloud-config.version>
<spring-cloud-netflix.version>1.0.2.RELEASE</spring-cloud-netflix.version>
<spring-cloud-security.version>1.0.1.RELEASE</spring-cloud-security.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-config.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cloudfoundry</artifactId>
<version>1.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-commons</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-commons.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-commons.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-security</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-cloudfoundry</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-cloudfoundry.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-commons.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bus-amqp</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-bus.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-config</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-config.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-turbine-amqp</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-bus-hystrix</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.inject.extensions</groupId>
@@ -172,7 +174,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka-server</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.inject.extensions</groupId>
@@ -247,82 +249,82 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-feign</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-oauth2</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-security</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-turbine</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-netflix.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-zuul-server</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-starters.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-aws-context</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-aws-autoconfigure</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-jdbc</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-aws-messaging</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-aws-jdbc</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-aws-messaging</artifactId>
<version>1.0.1.RELEASE</version>
<version>${spring-cloud-aws.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-ribbon</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-turbine-amqp</artifactId>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-turbine</artifactId>

View File

@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>1.0.1.RELEASE</version>
<version>1.0.2.RELEASE</version>
<relativePath>../spring-cloud-starter-parent</relativePath>
</parent>
<artifactId>spring-cloud-starter-zuul</artifactId>
@@ -31,17 +32,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.zuul</groupId>
<artifactId>zuul-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-ribbon</artifactId>
</dependency>
<dependency>
<groupId>com.netflix.zuul</groupId>
<artifactId>zuul-core</artifactId>
</dependency>
</dependencies>
</project>