From d13ca96f4e547462e92bfe0abf4141436512b353 Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Wed, 18 May 2016 17:20:06 +0300
Subject: [PATCH] Import only mockito-core instead of mockito-all

Also, move up the dependency to mappingservice/pom.xml, since we're
using it everywhere.

Change-Id: Ib6886dfb25e6b4ce5f43279f474d9b7679ee1ad2
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 mappingservice/implementation/pom.xml | 5 -----
 mappingservice/inmemorydb/pom.xml     | 5 -----
 mappingservice/lisp-proto/pom.xml     | 2 +-
 mappingservice/pom.xml                | 8 ++++++++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 53d77126a..6e9320d1e 100644
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -29,11 +29,6 @@
       <groupId>junit-addons</groupId>
       <artifactId>junit-addons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml
index a012deb6e..47a8934ed 100644
--- a/mappingservice/inmemorydb/pom.xml
+++ b/mappingservice/inmemorydb/pom.xml
@@ -17,11 +17,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <!--
diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 55efd0ad0..39e199900 100644
--- a/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@ -52,7 +52,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index 6cf913ab4..8e5ce262a 100644
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -75,6 +75,14 @@
     </dependencies>
   </dependencyManagement>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
   <build>
     <pluginManagement>
       <plugins>
-- 
2.36.6