Mercurial > hg > ConflictEditor

comparison 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
comparison
equal deleted inserted replaced
13:e99bb691f7ce 14:f2daf738299f
3 <modelVersion>4.0.0</modelVersion> 3 <modelVersion>4.0.0</modelVersion>
4 <groupId>de.codedo</groupId> 4 <groupId>de.codedo</groupId>
5 <artifactId>conflict-editor</artifactId> 5 <artifactId>conflict-editor</artifactId>
6 <version>1.0-SNAPSHOT</version> 6 <version>1.0-SNAPSHOT</version>
7 <packaging>jar</packaging> 7 <packaging>jar</packaging>
8 <name>new project</name> 8 <name>Conflict Editor</name>
9 <url>http://maven.apache.org</url> 9 <url>http://maven.apache.org</url>
10 10
11 <properties> 11 <properties>
12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13 <vmtype>org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType</vmtype> 13 <vmtype>org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType</vmtype>
24 <dependency> 24 <dependency>
25 <groupId>junit</groupId> 25 <groupId>junit</groupId>
26 <artifactId>junit</artifactId> 26 <artifactId>junit</artifactId>
27 <version>4.9</version> 27 <version>4.9</version>
28 <scope>test</scope> 28 <scope>test</scope>
29 <exclusions>
30 <exclusion>
31 <groupId>org.hamcrest</groupId>
32 <artifactId>hamcrest-core</artifactId>
33 </exclusion>
34 </exclusions>
35 </dependency>
36 <dependency>
37 <groupId>org.hamcrest</groupId>
38 <artifactId>hamcrest-library</artifactId>
39 <version>1.3.RC2</version>
40 <scope>test</scope>
29 </dependency> 41 </dependency>
30 <dependency> 42 <dependency>
31 <groupId>org.mockito</groupId> 43 <groupId>org.mockito</groupId>
32 <artifactId>mockito-all</artifactId> 44 <artifactId>mockito-all</artifactId>
33 <version>1.8.5</version> 45 <version>1.8.5</version>
46 <scope>test</scope>
34 </dependency> 47 </dependency>
35 </dependencies> 48 </dependencies>
36 49
37 <build> 50 <build>
38 <plugins> 51 <plugins>