Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant

manual/Tasks/property.html

@@ -296,7 +296,7 @@ deploy.url=http://${deploy.server}:${deploy.port}/
   variables. So it starts a command in a new process which prints the environment variables,
   analyzes the output and creates the properties. <br>
   There are commands for the following operating systems implemented in
-  <a href="http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java?view=markup">
+  <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=24e5a0e881dba01a6f012c4a271b743946412a0d">
   Execute.java</a> (method <tt>getProcEnvCommand()</tt>):
   <table>
     <tr>

manual/install.html

@@ -116,8 +116,8 @@ Ant release from
 <a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
 
 If you prefer the leading-edge code, you can access
-the code as it is being developed via SVN. The Ant website has details on
-<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
+the code as it is being developed via git. The Ant website has details on
+<a href="http://ant.apache.org/git.html" target="_top">accessing git</a>.
 All bug fixes will go in against the HEAD of the source tree, and the first
 response to many bugreps will be "have you tried the latest version".
 Don't be afraid to download and build a prererelease edition, as everything
@@ -129,7 +129,7 @@ other than new features are usually stable.
 See the section <a href="#buildingant">Building Ant</a> on how to
 build Ant from the source code.
 You can also access the
-<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
+<a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=summary" target="_top">
 Ant SVN repository</a> on-line. </p>
 
 <h3 name="archives">Archive Download Area Layout</h3>
@@ -721,7 +721,7 @@ at the source for your platform's invocation script for details.
 <hr>
 <h2><a name="buildingant">Building Ant</a></h2>
 <p>To build Ant from source, you can either install the Ant source distribution
-or checkout the ant module from SVN. See <a href="#sourceEdition">Source Edition</a> for details.</p>
+or clone the ant repository from git. See <a href="#sourceEdition">Source Edition</a> for details.</p>
 <p>Once you have installed the source, change into the installation
 directory.</p>
 

manual/properties.html

@@ -125,7 +125,7 @@ ant.library.dir     the directory that has been used to load Ant's
       <p>This is the interface you'd implement if you wanted to invent
         your own property syntax - or allow nested property expansions
         since the default implementation doesn't balance braces
-        (see <a href="http://svn.apache.org/viewvc/ant/antlibs/props/trunk/src/main/org/apache/ant/props/NestedPropertyExpander.java?view=log"><code>NestedPropertyExpander</code>
+        (see <a href="https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-props.git;a=blob;f=src/main/org/apache/ant/props/NestedPropertyExpander.java;hb=HEAD"><code>NestedPropertyExpander</code>
         in the "props" Antlib</a> for an example).</p>
     </li>
 

patch.xml

@@ -26,36 +26,23 @@
     <property name="patch.package" value="patch.tar.gz"/>
     <property name="patch.file" value="patch.txt"/>
 
-    <condition property="svn.found">
+    <condition property="git.found">
         <or>
-            <available file="svn" filepath="${env.PATH}"/>
-            <available file="svn.exe" filepath="${env.PATH}"/>
-            <available file="svn.exe" filepath="${env.Path}"/>
+            <available file="git" filepath="${env.PATH}"/>
+            <available file="git.exe" filepath="${env.PATH}"/>
+            <available file="git.exe" filepath="${env.Path}"/>
         </or>
     </condition>
 
     <target name="createpatch">
-        <fail unless="svn.found"
-              message="You need a version of svn to create the patch"/>
-        <exec executable="svn" output="${patch.file}">
+        <fail unless="git.found"
+              message="You need a version of git to create the patch"/>
+        <exec executable="git" output="${patch.file}">
             <arg value="diff"/>
         </exec>
     </target>
 
-    <target name="newfiles" depends="createpatch">
-        <delete file="${patch.package}"/>
-        <exec executable="svn" output="${patch.file}.tmp">
-            <arg value="status"/>
-        </exec>
-        <replace file="${patch.file}.tmp" token="?      " value=""/>
-    </target>
-
-    <target name="patchpackage" depends="newfiles">
-        <tar basedir="${basedir}"
-            tarfile="${patch.package}"
-            compression="gzip"
-            includesfile="${patch.file}.tmp"
-            excludes="${patch.file}.tmp"/>
-        <delete file="${patch.file}.tmp"/>
+    <target name="patchpackage" depends="createpatch">
+        <gzip src="${patch.file}" destfile="${patch.file}.gz"/>
     </target>
 </project>

src/etc/poms/pom.xml

@@ -51,9 +51,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
     </repository>
   </distributionManagement>
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/ant/core/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/ant/core/trunk</developerConnection>
-    <url>http://svn.apache.org/repos/asf/ant/core/trunk</url>
+    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/ant.git</connection>
+    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/ant.git</developerConnection>
+    <url>https://git-wip-us.apache.org/repos/asf/ant.git</url>
   </scm>
   <ciManagement>
     <system>hudson</system>