Repository: incubator-tinkerpop Updated Branches: refs/heads/tp31 19c77916e -> 1f0c34fa6
use mockito-core instead of mockito-all to avoid hamcrest conflict Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/27eedc47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/27eedc47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/27eedc47 Branch: refs/heads/tp31 Commit: 27eedc478b58cd9dee571960091a3c6505f2379e Parents: 029f56b Author: Jason Plurad <plur...@us.ibm.com> Authored: Fri Jun 3 13:05:10 2016 -0400 Committer: Jason Plurad <plur...@us.ibm.com> Committed: Fri Jun 3 13:05:10 2016 -0400 ---------------------------------------------------------------------- gremlin-test/pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/27eedc47/gremlin-test/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml index f3de2ed..8686e6d 100644 --- a/gremlin-test/pom.xml +++ b/gremlin-test/pom.xml @@ -51,11 +51,23 @@ limitations under the License. <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.mockito</groupId> - <artifactId>mockito-all</artifactId> + <artifactId>mockito-core</artifactId> <version>1.9.5</version> + <exclusions> + <exclusion> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.hamcrest</groupId>
