From 242419726d14c9d34ab1fb11cfd40241e6555104 Mon Sep 17 00:00:00 2001 From: Johannes Stelzer Date: Sat, 11 Apr 2015 16:49:30 +0200 Subject: [PATCH] Exclude mockito-all from zuul-core and turbine-core However turbine and zuul are depending on mockito-all in compile-scope. Not only I want to get rid of these (usually) test-dependencies, but also mockito-all contains some hamcrest-classes (in older versions) getting in conflict with the classes from spring-test --- spring-cloud-netflix-core/pom.xml | 4 ++++ spring-cloud-netflix-turbine/pom.xml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/spring-cloud-netflix-core/pom.xml b/spring-cloud-netflix-core/pom.xml index 70bda14c..ad6a83d4 100644 --- a/spring-cloud-netflix-core/pom.xml +++ b/spring-cloud-netflix-core/pom.xml @@ -135,6 +135,10 @@ groovy-all org.codehaus.groovy + + mockito-all + org.mockito + diff --git a/spring-cloud-netflix-turbine/pom.xml b/spring-cloud-netflix-turbine/pom.xml index 98f15ab5..31b5f02c 100644 --- a/spring-cloud-netflix-turbine/pom.xml +++ b/spring-cloud-netflix-turbine/pom.xml @@ -64,6 +64,12 @@ com.netflix.turbine turbine-core + + + org.mockito + mockito-all + + org.projectlombok