From e1a53fa011943085eef05316236c5e93a5f6895b Mon Sep 17 00:00:00 2001
From: Mikhaylo Demianenko <mikhaylo.demianenko@neotechnology.com>
Date: Fri, 6 Nov 2015 19:54:06 +0100
Subject: [PATCH] Remove duplicated mockito-all artifact. Bump mockito-core
 version to 1.10.19, Objenesis to 2.2

---
 community/graph-algo/pom.xml |  2 +-
 pom.xml                      | 11 ++---------
 tools/pom.xml                |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/community/graph-algo/pom.xml b/community/graph-algo/pom.xml
index 26d5f06245a39..82b5f1d4033c2 100644
--- a/community/graph-algo/pom.xml
+++ b/community/graph-algo/pom.xml
@@ -75,7 +75,7 @@ the relevant Commercial Agreement.
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 837727d0ffa44..a2dece557c24c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
     <licensing.prepend.text>notice-agpl-prefix.txt</licensing.prepend.text>
     <licensing.phase>compile</licensing.phase>
     <lucene.version>3.6.2</lucene.version>
-    <powermock.version>1.5.5</powermock.version>
     <logback-classic.version>1.1.2</logback-classic.version>
     <generate-config-docs-phase>prepare-package</generate-config-docs-phase>
     <hsqldb.version>2.3.2</hsqldb.version>
@@ -480,20 +479,14 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>1.9.5</version>
+        <version>1.10.19</version>
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-all</artifactId>
-        <version>1.9.5</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
           <groupId>org.objenesis</groupId>
           <artifactId>objenesis</artifactId>
-          <version>1.3</version>
+          <version>2.2</version>
           <scope>test</scope>
       </dependency>
 
diff --git a/tools/pom.xml b/tools/pom.xml
index 09715967e9a82..2d96755f0383a 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>