Skip to content

S
spring-cloud-netflix
Commit 13a3ea07 by Spencer Gibb
Options

Only manage turbine-core dep in modules

fixes gh-511
parent 43a5241d
Showing with 8 additions and 24 deletions
pom.xml
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<zuul.version>1.0.28</zuul.version> <zuul.version>1.0.28</zuul.version>
<rxjava.version>1.0.11</rxjava.version> <rxjava.version>1.0.11</rxjava.version>
<java.version>1.7</java.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> <spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
<cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version> <cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version>
</properties> </properties>
...@@ -210,29 +209,6 @@ ...@@ -210,29 +209,6 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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 --> <!-- Eureka core dep that is now optional -->
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
......
spring-cloud-netflix-turbine/pom.xml
...@@ -24,6 +24,14 @@ ...@@ -24,6 +24,14 @@
<version>${turbine.version}</version> <version>${turbine.version}</version>
<exclusions> <exclusions>
<exclusion> <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> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
</exclusion> </exclusion>
......
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