Author: maartenc Date: Tue Mar 3 20:46:05 2009 New Revision: 749743 URL: http://svn.apache.org/viewvc?rev=749743&view=rev Log: IMPROVEMENT: ivy:resolve ant task does not support "branch" attribute (IVY-1035)
Modified: ant/ivy/core/trunk/doc/use/postresolvetask.html ant/ivy/core/trunk/doc/use/resolve.html Modified: ant/ivy/core/trunk/doc/use/postresolvetask.html URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/postresolvetask.html?rev=749743&r1=749742&r2=749743&view=diff ============================================================================== --- ant/ivy/core/trunk/doc/use/postresolvetask.html (original) +++ ant/ivy/core/trunk/doc/use/postresolvetask.html Tue Mar 3 20:46:05 2009 @@ -63,6 +63,7 @@ <tr><td>organisation</td><td>the organisation of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it then defaults to last resolved module name</td></tr> <tr><td>module</td><td>the name of the module to retrieve. This usually doesn't need to be set since it defaults to the last resolved one, except for inline mode where it is required.</td><td>Yes in inline mode, otherwise no, it then defaults to last resolved module name</td></tr> <tr><td>revision</td><td>the revision constraint of the module to retrieve. Used only in inline mode. <span class="since">since 1.4</span></td><td>No. Defaults to latest.integration</td></tr> + <tr><td>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.0.1)</span></td><td>Defaults to no branch in inline mode, nothing in standard mode.</td></tr> <tr><td>transitive</td><td>true to resolve dependencies transitively, false otherwise <span class="since">since 1.4</span></td><td>No. Defaults to true</td></tr> <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false to continue</td><td>No. Defaults to true</td></tr> <tr><td>validate</td><td>true to force ivy files validation against ivy.xsd, false to force no validation</td><td>No. Defaults to default ivy value (as configured in configuration file)</td></tr> Modified: ant/ivy/core/trunk/doc/use/resolve.html URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/use/resolve.html?rev=749743&r1=749742&r2=749743&view=diff ============================================================================== --- ant/ivy/core/trunk/doc/use/resolve.html (original) +++ ant/ivy/core/trunk/doc/use/resolve.html Tue Mar 3 20:46:05 2009 @@ -127,6 +127,8 @@ <tr><td>revision</td><td>the revision constraint to apply to the module to resolve in inline mode <span class="since">since 1.4</span></td><td>No. Defaults to "latest.integration" in inline mode, nothing in standard mode.</td></tr> + <tr><td>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.0.1)</span></td><td>Defaults to no branch in inline mode, nothing in standard mode.</td></tr> + <tr><td>type</td><td>comma separated list of accepted artifact types (<span class="since">since 1.2</span>)</td><td>No. defaults to ${ivy.resolve.default.type.filter}</td></tr> <tr><td>haltonfailure</td><td>true to halt the build on ivy failure, false to continue</td><td>No. Defaults to true</td></tr>