Pull in PowerMock from odlparent

The Mockito upgrade breaks PowerMock 1.5.2; odlparent now provides the
necessary dependency management for PowerMock and will ensure that
Mockito and PowerMock versions are upgraded in sync.

Change-Id: I569f10df433ed8d0894c1dbc97aa9f9cbb8fbe5b
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
index caf83addd0fb661d968cf5a323ca4e543232bca9..eb697ef3d0697fa28b1d40053c6627ce06f05fa6 100644 (file)
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
@@ -22,10 +22,6 @@
     <artifactId>aaa-authn-mdsal-store-impl</artifactId>
     <packaging>bundle</packaging>
 
-    <properties>
-        <powermock.version>1.5.2</powermock.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -91,13 +87,11 @@
         <dependency>
           <groupId>org.powermock</groupId>
           <artifactId>powermock-api-mockito</artifactId>
-          <version>${powermock.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.powermock</groupId>
           <artifactId>powermock-module-junit4</artifactId>
-          <version>${powermock.version}</version>
           <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 34f8f01144d225564722ef65d900fd883d585d44..599cdff3343a844c2f3d9be51da346d778fee133 100755 (executable)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -21,7 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <properties>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
     <openflow.protocol.spi.version>0.8.0-SNAPSHOT</openflow.protocol.spi.version>
-    <powermock.version>1.5.2</powermock.version>
   </properties>
 
 
@@ -70,25 +69,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-core</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-support</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/aaa-idp-mapping/pom.xml b/aaa-idp-mapping/pom.xml
index 86f0f195b3042df9e2173bdb21e117fbcd65fd21..c948f3793115f9e011f06221bc3b12a46fa2e196 100644 (file)
--- a/aaa-idp-mapping/pom.xml
+++ b/aaa-idp-mapping/pom.xml
@@ -12,10 +12,6 @@
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-    <properties>
-        <powermock.version>1.5.2</powermock.version>
-    </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.glassfish</groupId>
@@ -55,13 +51,11 @@
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>