add common submodule
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..3ec196f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common"]
+ path = common
+ url = https://git-wip-us.apache.org/repos/asf/ant-antlibs-common.git
diff --git a/common b/common
new file mode 160000
index 0000000..51f7f81
--- /dev/null
+++ b/common
@@ -0,0 +1 @@
+Subproject commit 51f7f81979e31e6ca6d7711c16508a229e940e09
diff --git a/prepare.xml b/prepare.xml
index 8d4d0cf..852a4af 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -21,26 +21,33 @@
<!--
Interim build-snippet.
+<<<<<<< HEAD
The AntLibs depend on the common build infrastructure supplied by the
antlibs-common project. In subversion these are included via svn:external
directive. After migration to git there is need to have successor to that
directive. Until we have that, we could do a 'manual' git-clone.
+=======
+>>>>>>> add common submodule
The original of this snippet is maintained in the antlib-common project.
-->
<project default="bootstrap" xmlns:unless="ant:unless" xmlns:if="ant:if">
+<<<<<<< HEAD
<!-- AntLib-common Git-URL, so we could 'svn:external' that manually. -->
<property name="antlib.common.git" value="https://git-wip-us.apache.org/repos/asf/ant-antlibs-common.git"/>
<!-- Git executable -->
<property name="git" value="git"/>
+=======
+>>>>>>> add common submodule
<!-- Which released version of AntUnit to use, where to download, where to store. -->
<property name="antunit.version" value="1.3"/>
<property name="antunit.url" value="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
<property name="antunit.file" value="ant-antunit.jar"/>
<!-- Skip unnecessary tasks. -->
+<<<<<<< HEAD
<available property="common.present" file="common" type="dir"/>
<available property="antunit.present" file="${antunit.file}"/>
@@ -61,6 +68,10 @@
</exec>
</target>
+=======
+ <available property="antunit.present" file="${antunit.file}"/>
+
+>>>>>>> add common submodule
<target name="update-prepare-script">
<echo>updating prepare.xml</echo>
<copy file="common/prepare.xml" tofile="prepare.xml"/>
@@ -74,8 +85,13 @@
<!-- Use a 'bootstrap-phase' so changes of the preparation could be catched in the same CI-cycle. -->
<target name="bootstrap"
+<<<<<<< HEAD
depends="clone-common,update-common,update-prepare-script"
description="Bootstraps the preparation script by cloning the antlib-common and updating this script from there."
+=======
+ depends="update-prepare-script"
+ description="Bootstraps the preparation script by updating this script from common."
+>>>>>>> add common submodule
>
<echo>Bootstrap done. Next step:</echo>
<echo> ant -f prepare.xml prepare</echo>
@@ -90,4 +106,8 @@
<echo> ant -lib ${antunit.file} -lib build/lib test</echo>
</target>
-</project>
\ No newline at end of file
+<<<<<<< HEAD
+</project>
+=======
+</project>
+>>>>>>> add common submodule
