Remove powermock overrides

powermock should now be working out of the box, allowing us to
minimize dependencies.

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

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 1b3b6c8272072653406efc7ed6025cc9aa2e4181..a7ba31b9e86d1aedb110965ccf91ff15d1826d34 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -101,11 +101,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-reflect</artifactId>

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 3a15d8acbfe2fc5ac82ef25f7bf229dc35d0d7c2..ecc6c87fc2a0777a45b6cc5b554931bb1bbd5752 100644 (file)
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -110,31 +110,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-reflect</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/utils/config/pom.xml b/utils/config/pom.xml
index 159717f0e169ef4047e86704397fb66a19a0f124..7bd4e02ed84195f09f3049e8bfbf2a15e9505f29 100644 (file)
--- a/utils/config/pom.xml
+++ b/utils/config/pom.xml
@@ -31,33 +31,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
 
     <!-- testing dependencies -->
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- FIXME: remove this with odlparent-6.0.3 -->
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.26.0-GA</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/utils/servicehelper/pom.xml b/utils/servicehelper/pom.xml
index 10e92a7d10051ec59953352025faa7a95c394dbb..78becdd50611fefd8542c172623e514d9d5761b3 100644 (file)
--- a/utils/servicehelper/pom.xml
+++ b/utils/servicehelper/pom.xml
@@ -33,25 +33,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.osgi</groupId>