# HG changeset patch # User Dirk Olmes # Date 1318138199 -7200 # Node ID 6c85a4fcfe286008386eb134a1d9d2fd5d6fce9a # Parent 76b2dafcb1b4533b33b1243184044e8a257ce616 add a toplevel pom, make this a reactor build diff -r 76b2dafcb1b4 -r 6c85a4fcfe28 conflict-editor/pom.xml --- a/conflict-editor/pom.xml Fri Oct 07 05:59:38 2011 +0200 +++ b/conflict-editor/pom.xml Sun Oct 09 07:29:59 2011 +0200 @@ -1,17 +1,14 @@ 4.0.0 - de.codedo + + de.codedo + conflict-editor-parent + 1.0-SNAPSHOT + conflict-editor - 1.0-SNAPSHOT jar Conflict Editor - http://maven.apache.org - - - UTF-8 - org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType - @@ -51,30 +48,4 @@ test - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - UTF-8 - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.8 - - true - - org.eclipse.jdt.launching.JRE_CONTAINER/${vmtype}/JavaSE-1.6 - - - - - diff -r 76b2dafcb1b4 -r 6c85a4fcfe28 pom.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pom.xml Sun Oct 09 07:29:59 2011 +0200 @@ -0,0 +1,47 @@ + + + 4.0.0 + de.codedo + conflict-editor-parent + 1.0-SNAPSHOT + pom + Conflict Editor Parent + http://xanthippe.dyndns.org/ConflictEditor + + + UTF-8 + org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType + + + + conflict-editor + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + UTF-8 + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + true + + org.eclipse.jdt.launching.JRE_CONTAINER/${vmtype}/JavaSE-1.6 + + + + + + +