You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by je...@apache.org on 2013/01/25 23:12:28 UTC
git commit: Fix build errors caused by incompatiblity between JUnit,
Hamcrest and Mockito
Updated Branches:
refs/heads/trunk 312076c98 -> 7c81b67ea
Fix build errors caused by incompatiblity between JUnit, Hamcrest and Mockito
Project: http://git-wip-us.apache.org/repos/asf/mina/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/7c81b67e
Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/7c81b67e
Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/7c81b67e
Branch: refs/heads/trunk
Commit: 7c81b67ea810bdac4cbf46c750f63da46194b367
Parents: 312076c
Author: Jeff MAURY <je...@apache.org>
Authored: Fri Jan 25 23:12:05 2013 +0100
Committer: Jeff MAURY <je...@apache.org>
Committed: Fri Jan 25 23:12:05 2013 +0100
----------------------------------------------------------------------
core/pom.xml | 11 ++++++++++-
pom.xml | 6 +++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina/blob/7c81b67e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index fb85ba1..3530b59 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -37,9 +37,18 @@
</properties>
<dependencies>
+ <!-- put Junit in fromt because it seems Maven does not resolve correctly
+ hamcrest version which cause link errors since Junit 4.11
+ -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/mina/blob/7c81b67e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 55c3518..b5e29f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<version.guava>10.0.1</version.guava>
<version.junit>4.11</version.junit>
<version.log4j>2.0-beta2</version.log4j>
- <version.mockito-all>1.9.0-rc1</version.mockito-all>
+ <version.mockito-core>1.9.5</version.mockito-core>
<version.slf4j.api>1.6.4</version.slf4j.api>
<!-- Plugins versions =============================================== -->
@@ -132,8 +132,8 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${version.mockito-all}</version>
+ <artifactId>mockito-core</artifactId>
+ <version>${version.mockito-core}</version>
<scope>test</scope>
</dependency>