summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-04-04 14:01:11 +0000
committerRobert Gemmell <robbie@apache.org>2012-04-04 14:01:11 +0000
commit9edc62cd18ff3d3892a9090c4afb10f78e98a74a (patch)
tree6bb2564c437ad885154de9caa499563ffae0d02c
parent3861a2383b8d813e719de23ede126edfcfca429f (diff)
downloadqpid-python-9edc62cd18ff3d3892a9090c4afb10f78e98a74a.tar.gz
NO-JIRA: add mockito mocking framework, which is a dependency of the previous merged changes
merged from trunk r1302874 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.16@1309390 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/build.deps3
-rw-r--r--qpid/java/lib/mockito-all-1.9.0.jarbin0 -> 1495219 bytes
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index baf263e6a7..d55d3e055e 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -35,6 +35,7 @@ geronimo-kernel=lib/geronimo-kernel-2.2.1.jar
geronimo-openejb=lib/geronimo-ejb_3.0_spec-1.0.1.jar
junit=lib/junit-3.8.1.jar
+mockito-all=lib/mockito-all-1.9.0.jar
log4j=lib/log4j-1.2.12.jar
@@ -58,7 +59,7 @@ broker.libs=${commons-cli} ${commons-logging} ${log4j} ${slf4j-log4j} \
broker-plugins.libs=${felix.libs} ${log4j} ${commons-configuration.libs}
-junit-toolkit.libs=${log4j} ${junit} ${slf4j-api}
+junit-toolkit.libs=${log4j} ${junit} ${slf4j-api} ${mockito-all}
test.libs=${slf4j-log4j} ${junit-toolkit.libs}
ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
diff --git a/qpid/java/lib/mockito-all-1.9.0.jar b/qpid/java/lib/mockito-all-1.9.0.jar
new file mode 100644
index 0000000000..273fd50feb
--- /dev/null
+++ b/qpid/java/lib/mockito-all-1.9.0.jar
Binary files differ