Revert "remove test artifact from parent"

Removing the test versions was causing two different mockito
versions to be present.

This reverts commit 2285353c96dd9bb471e0861f29367f15fa56bce9.

Change-Id: Ib30ff034550c404afa3f21203f09939482c4b019
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1767

diff --git a/binding-parent/pom.xml b/binding-parent/pom.xml
index 409cb93..789d594 100644 (file)
--- a/binding-parent/pom.xml
+++ b/binding-parent/pom.xml
@@ -157,6 +157,48 @@ limitations under the License.
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.javassist</groupId>
+               <artifactId>javassist</artifactId>
+               <version>3.21.0-GA</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.mockito</groupId>
+               <artifactId>mockito-core</artifactId>
+               <version>1.10.19</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-module-junit4</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-api-support</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-reflect</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
+            <dependency>
+               <groupId>org.powermock</groupId>
+               <artifactId>powermock-core</artifactId>
+               <version>1.6.4</version>
+               <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 62700db..6c9c95a 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -38,6 +38,48 @@ limitations under the License.
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.21.0-GA</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-support</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-reflect</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-core</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 3770c2e..39694c9 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -73,6 +73,48 @@ limitations under the License.
                 <artifactId>dblib-provider</artifactId>
                 <version>${sdnctl.dblib.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.javassist</groupId>
+                <artifactId>javassist</artifactId>
+                <version>3.21.0-GA</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>1.10.19</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-module-junit4</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-support</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-reflect</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-core</artifactId>
+                <version>1.6.4</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>