Remove powermock overrides

powermock should now be working out of the box, allowing us to minimize dependencies. Note: this leaves parts which still have powermock-1.7.4 alone, subject to future cleanup. Change-Id: Ie03d0751f0ee2e87cd584138bc5a82449b7bdcb6 Signed-off-by: Robert Varga <[email protected]>
opendaylight · Dec 16, 2019 · 784bc63 · 784bc63
1 parent e07c37d
commit 784bc63
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 80 deletions.
diff --git a/sfc-classifiers/sfc-scf-openflow/pom.xml b/sfc-classifiers/sfc-scf-openflow/pom.xml
@@ -52,14 +52,6 @@
         </dependency>
 
         <!-- Testing dependencies -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>

diff --git a/sfc-ovs/pom.xml b/sfc-ovs/pom.xml
@@ -28,10 +28,6 @@
       <version>${ovsdb.southbound.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
@@ -40,10 +36,6 @@
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-reflect</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>

diff --git a/sfc-provider/pom.xml b/sfc-provider/pom.xml
@@ -67,7 +67,6 @@
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/sfc-renderers/sfc-ios-xe-renderer/pom.xml b/sfc-renderers/sfc-ios-xe-renderer/pom.xml
@@ -57,34 +57,13 @@
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991</artifactId>
     </dependency>
-   <dependency>
-     <groupId>org.mockito</groupId>
-     <artifactId>mockito-core</artifactId>
-   </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.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-support</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-reflect</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/sfc-renderers/sfc-openflow-renderer/pom.xml b/sfc-renderers/sfc-openflow-renderer/pom.xml
@@ -47,34 +47,13 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-   <dependency>
-     <groupId>org.mockito</groupId>
-     <artifactId>mockito-core</artifactId>
-   </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.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-support</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-reflect</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

diff --git a/sfc-sb-rest/pom.xml b/sfc-sb-rest/pom.xml
@@ -53,18 +53,10 @@
       <scope>provided</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>

diff --git a/sfc-util/sfc-genius-utils/pom.xml b/sfc-util/sfc-genius-utils/pom.xml
@@ -36,19 +36,6 @@
       <artifactId>sfc-provider</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>