Mercurial > hg > ConflictEditor

annotate conflict-editor/pom.xml @ 35:a3f88353554a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not use a custom combo box model, instead fill a default one from preferences and attach an action listener to the combo that ensures that yet unknown database URLs will be stored in preferences.
author dirk
date Fri, 07 Oct 2011 05:41:53 +0200
parents 56cf93ee85f4
children 6c85a4fcfe28
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>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
4 <groupId>de.codedo</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
5 <artifactId>conflict-editor</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
6 <version>1.0-SNAPSHOT</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
7 <packaging>jar</packaging>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
8 <name>Conflict Editor</name>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
9 <url>http://maven.apache.org</url>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
10
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
11 <properties>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
12 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
13 <vmtype>org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType</vmtype>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
14 </properties>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
15
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
16 <dependencies>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
17 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
18 <groupId>org.codehaus.jackson</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
19 <artifactId>jackson-mapper-asl</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
20 <version>1.8.5</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
21 </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
22 <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
23 <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
24 <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
25 <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
26 </dependency>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
27
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
28 <!-- test dependencies -->
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
29 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
30 <groupId>junit</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
31 <artifactId>junit</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
32 <version>4.9</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
33 <scope>test</scope>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
34 <exclusions>
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 <groupId>org.hamcrest</groupId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
37 <artifactId>hamcrest-core</artifactId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
38 </exclusion>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
39 </exclusions>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
40 </dependency>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
41 <dependency>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
42 <groupId>org.hamcrest</groupId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
43 <artifactId>hamcrest-library</artifactId>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
44 <version>1.3.RC2</version>
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
45 <scope>test</scope>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
46 </dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
47 <dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
48 <groupId>org.mockito</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
49 <artifactId>mockito-all</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
50 <version>1.8.5</version>
14
f2daf738299f implement a test case for DocumentMatcher that covers the currently implemented cases
dirk
parents: 0
diff changeset
51 <scope>test</scope>
0
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
52 </dependency>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
53 </dependencies>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
54
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
55 <build>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
56 <plugins>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
57 <plugin>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
58 <groupId>org.apache.maven.plugins</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
59 <artifactId>maven-compiler-plugin</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
60 <version>2.3.2</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
61 <configuration>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
62 <source>1.6</source>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
63 <target>1.6</target>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
64 <encoding>UTF-8</encoding>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
65 </configuration>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
66 </plugin>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
67 <plugin>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
68 <groupId>org.apache.maven.plugins</groupId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
69 <artifactId>maven-eclipse-plugin</artifactId>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
70 <version>2.8</version>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
71 <configuration>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
72 <downloadSources>true</downloadSources>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
73 <classpathContainers>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
74 <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER/${vmtype}/JavaSE-1.6</classpathContainer>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
75 </classpathContainers>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
76 </configuration>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
77 </plugin>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
78 </plugins>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
79 </build>
6f11757c4811 first drop of the conflict editor - mostly model work
Dirk Olmes <dirk@xanthippe.ping.de>
parents:
diff changeset
80 </project>