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-config | |
| 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-config')
| -rw-r--r-- | appc-config/appc-config-adaptor/provider/pom.xml | 26 | ||||
| -rw-r--r-- | appc-config/appc-config-audit/provider/pom.xml | 7 | ||||
| -rw-r--r-- | appc-config/appc-config-generator/provider/pom.xml | 17 | ||||
| -rw-r--r-- | appc-config/appc-config-params/provider/pom.xml | 9 | ||||
| -rw-r--r-- | appc-config/appc-data-services/provider/pom.xml | 2 | ||||
| -rw-r--r-- | appc-config/appc-encryption-tool/provider/pom.xml | 6 | ||||
| -rw-r--r-- | appc-config/appc-flow-controller/provider/pom.xml | 3 |
7 files changed, 21 insertions, 49 deletions
diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index 3ca89be77..32e2c0981 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -59,23 +59,15 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.4</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> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 0acf8ee3f..32d7d5627 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -97,12 +97,7 @@ <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> + </dependencies> <build> diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index b11c907c5..37974f71a 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -114,17 +114,16 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> - <version>1.6.4</version> - <scope>test</scope> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.6.4</version> + <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - <version>1.10.19</version> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> </dependency> </dependencies> diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml index 300e7b064..6d4ebf8f4 100644 --- a/appc-config/appc-config-params/provider/pom.xml +++ b/appc-config/appc-config-params/provider/pom.xml @@ -58,7 +58,7 @@ </exclusion> </exclusions> </dependency> - <dependency> +<dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>1.2.3</version> @@ -102,12 +102,7 @@ <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> + </dependencies> <build> diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index feb2a4f65..f5125e707 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -86,8 +86,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <scope>test</scope> - <version>1.10.19</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index b0e396b0b..6af583e8c 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -90,12 +90,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.10.19</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> </dependency> diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index ed08a2cee..25cc4737a 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -107,10 +107,9 @@ <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> - <dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> |