diff options
| -rw-r--r-- | athenz-identity-provider-service/pom.xml | 2 | ||||
| -rw-r--r-- | clustercontroller-core/pom.xml | 2 | ||||
| -rw-r--r-- | documentapi/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 3 | ||||
| -rw-r--r-- | parent/pom.xml | 5 | ||||
| -rw-r--r-- | vespa-http-client/pom.xml | 3 | ||||
| -rw-r--r-- | vespaclient-container-plugin/pom.xml | 3 |
7 files changed, 6 insertions, 14 deletions
diff --git a/athenz-identity-provider-service/pom.xml b/athenz-identity-provider-service/pom.xml index 3274599f70f..5d060838891 100644 --- a/athenz-identity-provider-service/pom.xml +++ b/athenz-identity-provider-service/pom.xml @@ -86,7 +86,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> </dependencies> diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 6bfa308bb10..3b1cb16aa96 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -24,7 +24,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/documentapi/pom.xml b/documentapi/pom.xml index a91ccb68827..245c20b3a46 100644 --- a/documentapi/pom.xml +++ b/documentapi/pom.xml @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml index d802e0585dc..ca035ec1e2e 100644 --- a/jdisc_core/pom.xml +++ b/jdisc_core/pom.xml @@ -47,9 +47,8 @@ <version>1.2</version> </dependency> <dependency> - <!-- TODO: mockito-all is deprecated (includes old hamcrest). Use mockito-core if possible --> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 2c8e7264e23..89929089e99 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -637,11 +637,6 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.9.5</version> - </dependency> - <dependency> - <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>1.9.5</version> <scope>test</scope> diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index a33c7f15bf7..18dd34ee7be 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -105,8 +105,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.4</version> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml index a0472c8d102..959fb687692 100644 --- a/vespaclient-container-plugin/pom.xml +++ b/vespaclient-container-plugin/pom.xml @@ -64,8 +64,7 @@ </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> - <version>1.8.4</version> + <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> <dependency> |