From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 29 Dec 2023 11:12:31 +0000 (+0100)
Subject: Do not use mockito-subclass
X-Git-Tag: v13.0.0~50
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=c0fdfb93e45578d4ad4715602d2d807bf69924a3

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 85351df9c7..ff22e6674d 100644
--- 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 b66b846661..34f274b3fd 100644
--- 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 90d72b576c..740106d963 100644
--- 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>