ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject git commit: add common submodule
Date Sat, 26 Jul 2014 05:53:03 GMT
Repository: ant-antlibs-props
Updated Branches:
  refs/heads/master 2857660e2 -> b1d008e4e


add common submodule


Project: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/commit/b1d008e4
Tree: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/tree/b1d008e4
Diff: http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/diff/b1d008e4

Branch: refs/heads/master
Commit: b1d008e4eed1e99aadd224d98bf53e07d02d378d
Parents: 2857660
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sat Jul 26 07:52:25 2014 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sat Jul 26 07:52:25 2014 +0200

----------------------------------------------------------------------
 .gitmodules |  3 +++
 common      |  1 +
 prepare.xml | 22 +++++++++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/blob/b1d008e4/.gitmodules
----------------------------------------------------------------------
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

http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/blob/b1d008e4/common
----------------------------------------------------------------------
diff --git a/common b/common
new file mode 160000
index 0000000..51f7f81
--- /dev/null
+++ b/common
@@ -0,0 +1 @@
+Subproject commit 51f7f81979e31e6ca6d7711c16508a229e940e09

http://git-wip-us.apache.org/repos/asf/ant-antlibs-props/blob/b1d008e4/prepare.xml
----------------------------------------------------------------------
diff --git a/prepare.xml b/prepare.xml
index 8d4d0cf..852a4af 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -21,26 +21,33 @@ under the License.
 <!--
 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 @@ The original of this snippet is maintained in the antlib-common project.
     </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 @@ The original of this snippet is maintained in the antlib-common project.
   
   <!-- 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 @@ The original of this snippet is maintained in the antlib-common project.
     <echo> ant -lib ${antunit.file} -lib build/lib test</echo>
   </target>
 
-</project>
\ No newline at end of file
+<<<<<<< HEAD
+</project>
+=======
+</project>
+>>>>>>> add common submodule


Mime
View raw message