Mercurial > hg > ConflictEditor

diff conflict-editor/pom.xml @ 14:f2daf738299f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement a test case for DocumentMatcher that covers the currently implemented cases
author dirk
date Fri, 16 Sep 2011 11:38:15 +0200
parents 6f11757c4811
children 56cf93ee85f4
line wrap: on
line diff
--- a/conflict-editor/pom.xml	Tue Sep 13 08:24:35 2011 +0200
+++ b/conflict-editor/pom.xml	Fri Sep 16 11:38:15 2011 +0200
@@ -5,7 +5,7 @@
     <artifactId>conflict-editor</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>new project</name>
+    <name>Conflict Editor</name>
     <url>http://maven.apache.org</url>
 
     <properties>
@@ -26,11 +26,24 @@
             <artifactId>junit</artifactId>
             <version>4.9</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3.RC2</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>1.8.5</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>