Do not use mockito-subclass

Upgraded Mockito seems to cope well with the tests now, remove the
workaround.

Change-Id: I4130a2fff5a62e73d56b69354287b13a8caba615
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-dom-adapter/pom.xml b/binding/mdsal-binding-dom-adapter/pom.xml
index 85351df9c7817750f7239a362d345642469fa5b8..ff22e6674d42c0e8b608bcf9b166ddfccfdceeb4 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/pom.xml
+++ b/binding/mdsal-binding-dom-adapter/pom.xml
@@ -173,11 +173,6 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-model</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-subclass</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/binding/mdsal-binding-dom-codec/pom.xml b/binding/mdsal-binding-dom-codec/pom.xml
index b66b84666160c4830387f81cb5ac7c390d8ac5fb..34f274b3fd18c34d6495339d12571fac08b7076c 100644 (file)
--- a/binding/mdsal-binding-dom-codec/pom.xml
+++ b/binding/mdsal-binding-dom-codec/pom.xml
@@ -103,13 +103,6 @@
             <artifactId>org.osgi.service.component.annotations</artifactId>
         </dependency>
 
-        <!-- FIXME: default mockito-inline does not seem to quite work -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-subclass</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>

diff --git a/entityownership/mdsal-eos-binding-adapter/pom.xml b/entityownership/mdsal-eos-binding-adapter/pom.xml
index 90d72b576c811b5f8e0379f04cd06d257cbd3485..740106d9636b99cb20c48d0dc0957f39553ab7a7 100644 (file)
--- a/entityownership/mdsal-eos-binding-adapter/pom.xml
+++ b/entityownership/mdsal-eos-binding-adapter/pom.xml
@@ -75,11 +75,6 @@
             <artifactId>commons-lang3</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-subclass</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-generator</artifactId>