diff options
| author |   Patrick Brady <patrick.brady@att.com> | 2019-10-18 11:49:03 -0700 |
|---|---|---|
| committer | Patrick Brady <patrick.brady@att.com> | 2019-10-18 11:49:17 -0700 |
| commit | 09bd5d0207995ddc4818c32e3c683514946b48b0 (patch) | |
| tree | fd1e6e1ef09f9e9e919462ec8b0963286720a821 /appc-dg | |
| parent | 1a3687c958627f2ce6aeaffe65a674ab577dc356 (diff) | |
Revert "update mockito version in APPC"
The version is in the parent files again.
This reverts commit c13a9c95e47b072afb701ad490480036ef36db26.
Change-Id: Ie6cb57e8b1b8efbf5e516820efbbfb144791b97f
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1767
Diffstat (limited to 'appc-dg')
7 files changed, 7 insertions, 27 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml index 6b6f85c10..56b381e39 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml @@ -62,23 +62,23 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> <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-api-mockito</artifactId> - <version>1.6.4</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> diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml index 8747dddcb..d478c83e3 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml @@ -115,26 +115,22 @@ <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-api-mockito</artifactId> - <version>1.6.4</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-easymock</artifactId> - <version>1.6.4</version> - <scope>test</scope> + <version>1.6.2</version> </dependency> <dependency> <groupId>org.onap.appc</groupId> diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml index 3f2b2ce67..8d83547cc 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml @@ -85,13 +85,11 @@ <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-api-mockito</artifactId> - <version>1.6.4</version> <scope>test</scope> </dependency> <dependency> diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml index 350a79999..b6a4c475c 100644 --- a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>org.onap.appc</groupId> <artifactId>appc-license-manager-api</artifactId> - <version>${project.version}</version> + <version>1.7.0-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -58,7 +58,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.10.19</version> <scope>test</scope> </dependency> </dependencies> diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml index 6ea4f3955..8a12ab791 100644 --- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml @@ -67,20 +67,14 @@ <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-api-mockito</artifactId> - <version>1.6.4</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.javassist</groupId> diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml index e33a644a5..ecfbee6a6 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml @@ -68,19 +68,18 @@ <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-api-mockito</artifactId> - <version>1.6.4</version> <scope>test</scope> + </dependency> <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-junit4</artifactId> - <version>1.6.4</version> <scope>test</scope> </dependency> diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml index 15374f154..aed8ef21b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml @@ -61,12 +61,6 @@ <artifactId>junit</artifactId> <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.onap.appc</groupId> <artifactId>appc-ssh-adapter-tests</artifactId> |