moved spring-cloud-bus-{hystrix,turbine} to spring-cloud-netflix-{hystrix,turbine}-amqp

fixes gh-108
This commit is contained in:
Spencer Gibb
2014-12-17 13:26:21 -07:00
parent 71d0a474f7
commit 4dc7972fa5
22 changed files with 1238 additions and 22 deletions

25
pom.xml
View File

@@ -28,8 +28,10 @@
<modules>
<module>spring-cloud-netflix-core</module>
<module>spring-cloud-netflix-hystrix-dashboard</module>
<module>spring-cloud-netflix-hystrix-amqp</module>
<module>spring-cloud-netflix-eureka-server</module>
<module>spring-cloud-netflix-turbine</module>
<module>spring-cloud-netflix-turbine-amqp</module>
<module>spring-cloud-netflix-sidecar</module>
<module>docs</module>
</modules>
@@ -184,21 +186,6 @@
<artifactId>rxjava-core</artifactId>
<version>${netflix.rxjava.version}</version>
</dependency>
<dependency>
<groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId>
<version>${turbine.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.netflix.zuul</groupId>
<artifactId>zuul-core</artifactId>
@@ -210,6 +197,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-java-dsl</artifactId>
<version>${spring-integration-dsl.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -265,10 +257,11 @@
<feign.version>6.1.3</feign.version>
<hystrix.version>1.4.0-RC5</hystrix.version>
<ribbon.version>2.0-RC13</ribbon.version>
<turbine.version>1.0.0</turbine.version>
<zuul.version>1.0.28</zuul.version>
<netflix.rxjava.version>0.20.7</netflix.rxjava.version>
<java.version>1.7</java.version>
<spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
<cloud-connectors.version>1.1.1.BUILD-SNAPSHOT</cloud-connectors.version>
</properties>
<build>