You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/10 13:55:39 UTC
[2/2] git commit: Use mockito-core instead of mockito-all because the
latter brings an old version of Hamcrest shaded in it.
Use mockito-core instead of mockito-all because the latter brings an old version of Hamcrest shaded in it.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/35297acf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/35297acf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/35297acf
Branch: refs/heads/master
Commit: 35297acfab0566bb11115d00863b0fa4b000ecd8
Parents: 6971b62
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 10 14:54:44 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 10 14:54:44 2013 +0300
----------------------------------------------------------------------
pom.xml | 4 ++--
wicket-core/pom.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/35297acf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45b0221..6967ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,7 +365,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
@@ -498,7 +498,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/wicket/blob/35297acf/wicket-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index b406fe7..9915ac8 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>provided</scope>
<!-- provided because of the -test jar we build? -->
</dependency>