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/b38a50ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b38a50ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b38a50ae Branch: refs/heads/graphml-no-edge-label Commit: b38a50aeb1ea1157604bb9d4c0c310956ddca8ec Parents: b889feb Author: Jason Plurad <plur...@us.ibm.com> Authored: Fri Jun 3 13:05:10 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jun 8 16:24:33 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/b38a50ae/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>
