Author: maartenc
Date: Wed Sep 22 21:10:25 2010
New Revision: 1000232
URL: http://svn.apache.org/viewvc?rev=1000232&view=rev
Log:
Merged revision 1000225 from trunk.
Modified:
ant/ivy/core/branches/2.2.x/ (props changed)
ant/ivy/core/branches/2.2.x/CHANGES.txt
Propchange: ant/ivy/core/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 22 21:10:25 2010
@@ -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,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997711-997931,1000206
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997711-997931,1000206,1000225
Modified: ant/ivy/core/branches/2.2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.x/CHANGES.txt?rev=1000232&r1=1000231&r2=1000232&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.2.x/CHANGES.txt Wed Sep 22 21:10:25 2010
@@ -121,7 +121,7 @@ for detailed view of each issue, please
- IMPROVEMENT: the <artifact> child of ivy:publish now accepts any attribute
- IMPROVEMENT: Handle attributes in description subelements (IVY-1214) (thanks
to Jean-Louis Boudart)
- IMPROVEMENT: Use IvyAuthenticator only when it is really necessary (IVY-1211)
-- IMPROVEMENT: MakePom task handling of mulitple artifacts for Maven2
(IVY-707) (thanks to Jesper Pedersen)
+- IMPROVEMENT: MakePom task handling of mulitple artifacts for Maven2
(IVY-770) (thanks to Jesper Pedersen)
- IMPROVEMENT: ivy:makepom now has an option to disable the generation of an
extra Ivy comment block in the POM
- IMPROVEMENT: ivy:makepom now accepts a list of configurations to include
(IVY-1005) (thanks to Jesper Pedersen)
- IMPROVEMENT: ivy:makepom can generate a <description> element in the pom
(IVY-1215) (thanks to Jesper Pedersen)
