Merge "Replace mockito-all by mockito-core (see Bug 7662)"

diff --combined renderers/vpp/pom.xml
index a1015dae8cb188dc112ca524a6e2b0977a7c7f71,0f4d48c273b75ff45ff81697785127f836957850..63f679dea7ff19634a3d138876e1e74cf525586e
--- 1/renderers/vpp/pom.xml
--- 2/renderers/vpp/pom.xml
+++ b/renderers/vpp/pom.xml
@@@ -85,7 -85,7 +85,7 @@@
      </dependency>
      <dependency>
        <groupId>org.mockito</groupId>
-       <artifactId>mockito-all</artifactId>
+       <artifactId>mockito-core</artifactId>
        <scope>test</scope>
      </dependency>
      <dependency>
@@@ -115,8 -115,7 +115,8 @@@
          <configuration>
            <instructions>
              <Export-Package>
 -              org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.*
 +              org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.*,
 +              org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_adapter.rev161201.*
              </Export-Package>
            </instructions>
          </configuration>