Skip to content

S
spring-cloud-netflix
Commit ee97ef62 by Spencer Gibb
Options

push versioning of turbine down to modules.

fixes https://github.com/spring-cloud-samples/turbine/issues/3
parent 5c18b02c
Showing with 50 additions and 30 deletions
pom.xml
...@@ -210,29 +210,6 @@ ...@@ -210,29 +210,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
...@@ -31,6 +31,18 @@ ...@@ -31,6 +31,18 @@
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
...@@ -64,12 +76,6 @@ ...@@ -64,12 +76,6 @@
<dependency> <dependency>
<groupId>com.netflix.turbine</groupId> <groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId> <artifactId>turbine-core</artifactId>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
......
spring-cloud-starter-turbine-amqp/pom.xml
...@@ -66,8 +66,17 @@ ...@@ -66,8 +66,17 @@
<dependency> <dependency>
<groupId>com.netflix.turbine</groupId> <groupId>com.netflix.turbine</groupId>
<artifactId>turbine-core</artifactId> <artifactId>turbine-core</artifactId>
<!-- TODO: turbine 1.0.0 is coming from s-c-netflix pom import -->
<version>${turbine.version}</version> <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>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.reactivex</groupId> <groupId>io.reactivex</groupId>
......
spring-cloud-starter-turbine/pom.xml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
</organization> </organization>
<properties> <properties>
<main.basedir>${basedir}/../..</main.basedir> <main.basedir>${basedir}/../..</main.basedir>
<turbine.version>1.0.0</turbine.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -28,5 +29,32 @@ ...@@ -28,5 +29,32 @@
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-turbine</artifactId> <artifactId>spring-cloud-netflix-turbine</artifactId>
</dependency> </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>
<exclusion>
<groupId>com.netflix.rxjava</groupId>
<artifactId>rxjava-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
</project> </project>
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