Author: xavier
Date: Thu Jan 3 01:21:51 2008
New Revision: 608390
URL: http://svn.apache.org/viewvc?rev=608390&view=rev
Log:
IMPROVEMENT: Downgrade Ant version requirement to 1.6 to build Ivy (IVY-687)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/build.xml
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=608390&r1=608389&r2=608390&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Jan 3 01:21:51 2008
@@ -62,6 +62,7 @@
- IMPROVEMENT: Flexible cache management (IVY-399 - not completed yet)
- IMPROVEMENT: Decrease memory footprint (IVY-662)
+- IMPROVEMENT: Downgrade Ant version requirement to 1.6 to build Ivy (IVY-687)
- FIX: Ivy doesn't respect the order of the ivy patterns as defined in the
settings (IVY-676)
- FIX: XmlModuleDescriptorWriter doesn't write the deprecated attribute of the
"ivy-module/configurations/conf" element (IVY-664)
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=608390&r1=608389&r2=608390&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Thu Jan 3 01:21:51 2008
@@ -293,9 +293,14 @@
-->
<copy file="${basedir}/META-INF/MANIFEST.MF"
tofile="${artifacts.build.dir}/MANIFEST.MF">
<filterchain>
+ <!-- with Ant 1.7 excluding the line would be:
<linecontains negate="true">
- <contains value="Bundle-Version"/>
+ <contains value="Bundle-Version"/>
</linecontains>
+ -->
+ <linecontainsregexp>
+ <regexp
pattern="[^B][^u][^n][^d][^l][^e][^\-][^V][^e][^r][^s][^i][^o][^n].*"/>
+ </linecontainsregexp>
</filterchain>
</copy>
