Author: maartenc
Date: Mon Apr 6 22:01:17 2009
New Revision: 762526
URL: http://svn.apache.org/viewvc?rev=762526&view=rev
Log:
Merged recent changes from trunk into 2.1.x branch.
Modified:
ant/ivy/core/branches/2.1.x/ (props changed)
ant/ivy/core/branches/2.1.x/doc/install.html
Propchange: ant/ivy/core/branches/2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 22:01:17 2009
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,756158-762517
+/ant/ivy/core/trunk:695737,696014-696031,696442,756158-762525
Modified: ant/ivy/core/branches/2.1.x/doc/install.html
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/install.html?rev=762526&r1=762525&r2=762526&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/install.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/install.html Mon Apr 6 22:01:17 2009
@@ -52,7 +52,7 @@
<h1>Automatically</h1>
If you want to use Ivy only in your ant build scripts, and have an internet
connection when you build, you can download Ivy from this site and use the
downloaded version automatically, using this simple build snippet:
<code type="xml">
- <property name="ivy.install.version" value="2.0.0-beta1" />
+ <property name="ivy.install.version" value="2.1.0" />
<condition property="ivy.home" value="${env.IVY_HOME}">
<isset property="env.IVY_HOME" />
</condition>
@@ -64,8 +64,8 @@
<mkdir dir="${ivy.jar.dir}"/>
<!-- download Ivy from web site so that it can be used even without
any special installation -->
- <get
src="http://www.apache.org/dist/ant/ivy/${ivy.install.version}/ivy.jar";
- dest="${ivy.jar.file}" usetimestamp="true"/>
+ <get
src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar";
+ dest="${ivy.jar.file}" usetimestamp="true"/>
</target>
<target name="init-ivy" depends="download-ivy">
