Mercurial > hg > ConflictEditor

annotate conflict-editor/pom.xml @ 42:7380d8ff1a66 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bring up a message dialog if the selected database did not contain any conflicts
author dirk
date Thu, 05 Jan 2012 05:33:19 +0100
parents 6c85a4fcfe28
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
1 <?xml version="1.0" encoding="UTF-8"?>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
2 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
3 <modelVersion>4.0.0</modelVersion>
38
6c85a4fcfe28 add a toplevel pom, make this a reactor build
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 31
diff changeset
4 <parent>
6c85a4fcfe28 add a toplevel pom, make this a reactor build
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 31
diff changeset
5 <groupId>de.codedo</groupId>
6c85a4fcfe28 add a toplevel pom, make this a reactor build
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 31
diff changeset
6 <artifactId>conflict-editor-parent</artifactId>
6c85a4fcfe28 add a toplevel pom, make this a reactor build
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 31
diff changeset
7 <version>1.0-SNAPSHOT</version>
6c85a4fcfe28 add a toplevel pom, make this a reactor build
Dirk Olmes <dirk@xanthippe.ping.de>
parents: 31
diff changeset
8 </parent>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
9 <artifactId>conflict-editor</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
10 <packaging>jar</packaging>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
11 <name>Conflict Editor</name>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
12
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
13 <dependencies>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
14 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
15 <groupId>org.codehaus.jackson</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
16 <artifactId>jackson-mapper-asl</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
17 <version>1.8.5</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
18 </dependency>
31
56cf93ee85f4 Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
dirk
parents: 14
diff changeset
19 <dependency>
56cf93ee85f4 Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
dirk
parents: 14
diff changeset
20 <groupId>org.apache.httpcomponents</groupId>
56cf93ee85f4 Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
dirk
parents: 14
diff changeset
21 <artifactId>httpclient</artifactId>
56cf93ee85f4 Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
dirk
parents: 14
diff changeset
22 <version>4.1.2</version>
56cf93ee85f4 Implement HttpAccess using Apache's HTTP components. This works much better in conjunction with UTF-8 encoded JSON
dirk
parents: 14
diff changeset
23 </dependency>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
24
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
25 <!-- test dependencies -->
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
26 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
27 <groupId>junit</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
28 <artifactId>junit</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
29 <version>4.9</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
30 <scope>test</scope>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
31 <exclusions>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
32 <exclusion>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
33 <groupId>org.hamcrest</groupId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
34 <artifactId>hamcrest-core</artifactId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
35 </exclusion>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
36 </exclusions>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
37 </dependency>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
38 <dependency>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
39 <groupId>org.hamcrest</groupId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
40 <artifactId>hamcrest-library</artifactId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
41 <version>1.3.RC2</version>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
42 <scope>test</scope>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
43 </dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
44 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
45 <groupId>org.mockito</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
46 <artifactId>mockito-all</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
47 <version>1.8.5</version>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
48 <scope>test</scope>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
49 </dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
50 </dependencies>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
51 </project>