Move mockito to dependencyManagement section in parent pom.

Change-Id: I6eeb91e1b5713db11b7ffdc9054eb6f316737079
Signed-off-by: Alissa Bonas <abonas@redhat.com>

diff --git a/opendaylight/sal/yang-prototype/sal/pom.xml b/opendaylight/sal/yang-prototype/sal/pom.xml
index 056602c9e07b11d70db38a55a9c473fb44b438d8..441d8576c665df8d88c82ddbe96ce561e4b759a3 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/pom.xml
@@ -174,6 +174,12 @@
                                <artifactId>yang-data-util</artifactId>
                                <version>${yang.version}</version>
                        </dependency>
                                <artifactId>yang-data-util</artifactId>
                                <version>${yang.version}</version>
                        </dependency>

+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+                   </dependency>

                </dependencies>
 
        </dependencyManagement>
                </dependencies>
 
        </dependencyManagement>


@@ -185,12 +191,6 @@
                        <scope>test</scope>
                        <optional>true</optional>
                </dependency>
                        <scope>test</scope>
                        <optional>true</optional>
                </dependency>

-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
-                       <scope>test</scope>
-               </dependency>

        </dependencies>
        <build>
         <pluginManagement>
        </dependencies>
        <build>
         <pluginManagement>

diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
index dc38f409a1b2025e1def61a234952b2e8321f161..cfd8de6f8c2d21f4b0602d568245c5185aa07d51 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/sal/sal-binding-broker-impl/pom.xml
@@ -114,8 +114,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

-            <version>1.9.5</version>
-            <scope>test</scope>

         </dependency>
     </dependencies>
 </project>
         </dependency>
     </dependencies>
 </project>