Replace mockito-all by mockito-core (see Bug 7662) 61/50861/3
authorMichael Vorburger <vorburger@redhat.com>
Mon, 23 Jan 2017 18:58:42 +0000 (19:58 +0100)
committerTom Pantelis <tpanteli@brocade.com>
Tue, 24 Jan 2017 03:27:56 +0000 (03:27 +0000)
The change req. to includeArtifactIds is kinda similar to
https://github.com/vorburger/xtendbeans/commit/78aa690f1b67240d4b36064cf49de104a84de058#diff-56e3a9b90e7a05e37996cc31c4798ae0

Funky - this was the ONLY one of almost 40 changes
made in bulk re. Bug 7662 which required additional
manual analysis and intervention... ;-)

Bug: 7662
Change-Id: Ibd14dd061024056392a020364647a70a87f2461d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
15 files changed:
opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/impl/pom.xml
opendaylight/md-sal/cds-access-client/pom.xml
opendaylight/md-sal/mdsal-it-parent/pom.xml
opendaylight/md-sal/messagebus-impl/pom.xml
opendaylight/md-sal/messagebus-util/pom.xml
opendaylight/md-sal/sal-akka-raft/pom.xml
opendaylight/md-sal/sal-binding-broker/pom.xml
opendaylight/md-sal/sal-binding-it/pom.xml
opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
opendaylight/md-sal/sal-clustering-commons/pom.xml
opendaylight/md-sal/sal-common-impl/pom.xml
opendaylight/md-sal/sal-distributed-datastore/pom.xml
opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
opendaylight/md-sal/sal-remoterpc-connector/pom.xml
opendaylight/md-sal/samples/toaster-provider/pom.xml

index 27c1ef0..a4ede26 100644 (file)
@@ -41,7 +41,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
index e229b41..10f8fe7 100644 (file)
@@ -58,7 +58,7 @@
 
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
index 72e0dba..eaa3d6b 100644 (file)
@@ -83,7 +83,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
index 19fcf06..aeae06a 100644 (file)
@@ -76,7 +76,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>
index 3da6b70..bb40768 100644 (file)
@@ -53,7 +53,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>
index 6f10615..ad8a736 100644 (file)
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 
index 98bd490..f83f4d7 100644 (file)
@@ -75,7 +75,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
index 6a2ac49..91ffdf6 100644 (file)
@@ -45,7 +45,7 @@
            <configuration>
             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
             <groupId>org.opendaylight.controller</groupId>
-            <includeArtifactIds>mockito-all,config-it-base,mdsal-it-base</includeArtifactIds>
+            <includeArtifactIds>mockito-core,objenesis,config-it-base,mdsal-it-base</includeArtifactIds>
             <excludes>META-INF\/**</excludes>
             <ignorePermissions>false</ignorePermissions>
            </configuration>
index 8289b84..b8f6e1e 100644 (file)
@@ -22,7 +22,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
index c1cb2d1..1d866a1 100644 (file)
@@ -25,7 +25,7 @@
 
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
index 8dbccb1..6c8cdbe 100644 (file)
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
index b32f042..e8c927f 100644 (file)
@@ -18,7 +18,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
index 968a66c..74e4525 100644 (file)
@@ -74,7 +74,7 @@
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 
index 260aa36..7563d06 100644 (file)
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
index de81d9f..a413061 100644 (file)
@@ -56,7 +56,7 @@
     <!-- used to mock up classes -->
      <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
 

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.