SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only manage turbine-core dep in modules

Browse Source 
fixes gh-511
This commit is contained in:
Spencer Gibb
2015-09-02 10:49:32 -06:00
parent 43a5241d3c
commit 13a3ea071d
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pom.xml
View File

@@ -32,7 +32,6 @@
<zuul.version>1.0.28</zuul.version>
<rxjava.version>1.0.11</rxjava.version>
<java.version>1.7</java.version>
<turbine.version>1.0.0</turbine.version>
<spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
<cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version>
</properties>
@@ -210,29 +209,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId>
<version>${turbine.version}</version>
<exclusions>
<exclusion>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Eureka core dep that is now optional -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>

8
spring-cloud-netflix-turbine/pom.xml
View File

@@ -23,6 +23,14 @@
<artifactId>turbine-core</artifactId>
<version>${turbine.version}</version>
<exclusions>
<exclusion>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>