You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2009/04/06 23:48:37 UTC
svn commit: r762522 - in /ant/ivy/core/branches/2.1.x: ./ NOTICE
doc/use/deliver.html doc/use/postresolvetask.html doc/use/resolve.html
Author: maartenc
Date: Mon Apr 6 21:48:36 2009
New Revision: 762522
URL: http://svn.apache.org/viewvc?rev=762522&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/NOTICE
ant/ivy/core/branches/2.1.x/doc/use/deliver.html
ant/ivy/core/branches/2.1.x/doc/use/postresolvetask.html
ant/ivy/core/branches/2.1.x/doc/use/resolve.html
Propchange: ant/ivy/core/branches/2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 6 21:48:36 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
+/ant/ivy/core/trunk:695737,696014-696031,696442,756158-762517
Modified: ant/ivy/core/branches/2.1.x/NOTICE
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/NOTICE?rev=762522&r1=762521&r2=762522&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/NOTICE (original)
+++ ant/ivy/core/branches/2.1.x/NOTICE Mon Apr 6 21:48:36 2009
@@ -1,8 +1,5 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the Apache Ivy distribution. ==
-=========================================================================
+Apache Ivy
+Copyright 2007-2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: ant/ivy/core/branches/2.1.x/doc/use/deliver.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/use/deliver.html?rev=762522&r1=762521&r2=762522&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/use/deliver.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/use/deliver.html Mon Apr 6 21:48:36 2009
@@ -103,7 +103,7 @@
<td>No, 'ivy.instance' is taken by default.</td></tr>
<tr><td>conf</td><td>comma-separated list of configurations to include in the delivered file. Accepts wildcards. <span class="since">(since 2.0)</span></td>
<td>No. Defaults to all configurations</td></tr>
- <tr><td>generateRevConstraint</td><td>true to automatically generate a 'revConstraint' attribute in the deliverd file (see the [[ivyfile/dependency]] page for more info about this attribute), false to never generate this attribute <span class="since">(since 2.0.1)</span></td>
+ <tr><td>generateRevConstraint</td><td>true to automatically generate a 'revConstraint' attribute in the deliverd file (see the [[ivyfile/dependency]] page for more info about this attribute), false to never generate this attribute <span class="since">(since 2.1.0)</span></td>
<td>No. Defaults to true</td></tr>
</tbody>
</table>
Modified: ant/ivy/core/branches/2.1.x/doc/use/postresolvetask.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/use/postresolvetask.html?rev=762522&r1=762521&r2=762522&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/use/postresolvetask.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/use/postresolvetask.html Mon Apr 6 21:48:36 2009
@@ -63,7 +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>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.1.0)</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/branches/2.1.x/doc/use/resolve.html
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.1.x/doc/use/resolve.html?rev=762522&r1=762521&r2=762522&view=diff
==============================================================================
--- ant/ivy/core/branches/2.1.x/doc/use/resolve.html (original)
+++ ant/ivy/core/branches/2.1.x/doc/use/resolve.html Mon Apr 6 21:48:36 2009
@@ -127,7 +127,7 @@
<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>branch</td><td>the name of the branch to resolve in inline mode <span class="since">(since 2.1.0)</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>