Repository: struts
Updated Branches:
  refs/heads/develop aa4d5b3cf -> 16e240b4a


Adds mockito mocking lib


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ce49822e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ce49822e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ce49822e

Branch: refs/heads/develop
Commit: ce49822e1e2faaee45ba8128df9ca533b17dbee1
Parents: aa4d5b3
Author: Lukasz Lenart <lukaszlen...@apache.org>
Authored: Tue Aug 5 09:37:44 2014 +0200
Committer: Lukasz Lenart <lukaszlen...@apache.org>
Committed: Tue Aug 5 09:37:44 2014 +0200

----------------------------------------------------------------------
 core/pom.xml | 12 ++++++++++++
 pom.xml      |  7 +++++++
 2 files changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/ce49822e/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index d9527f2..8a9b7b6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -286,6 +286,18 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- These jars have to be in the compile scope in order to work with 
apt plugin
              (struts-annotations) and javadoc (the rest to process xwork 
sources). Marking 
              them optional to exclude them from transitive dependency 
resolution -->

http://git-wip-us.apache.org/repos/asf/struts/blob/ce49822e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c7b69a9..9a20885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -801,6 +801,13 @@
             </dependency>
 
             <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
                 <groupId>jmock</groupId>
                 <artifactId>jmock-cglib</artifactId>
                 <version>1.2.0</version>

Reply via email to