Author: hibou
Date: Fri Apr 18 12:31:48 2008
New Revision: 649664
URL: http://svn.apache.org/viewvc?rev=649664&view=rev
Log:
IVY-802: The Bundle-Version is 0.0.0 in the build artifacts
- use replaceregexp which is simpler and still compatible with Ant 1.6
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=649664&r1=649663&r2=649664&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Apr 18 12:31:48 2008
@@ -112,6 +112,7 @@
- FIX: SFTP should verify input parameter for hostname (IVY-734)
- FIX: Classpath issues with vfs ftp while being used as a bundle (IVY-785)
- FIX: Relative include in a settings must be evaluated relatively to the
settings file (IVY-372)
+- FIX: The Bundle-Version is 0.0.0 in the build artifacts (IVY-802)
- DOCUMENTATION: Broken link in documentation in Ivy files section, info
element page (IVY-788)
- DOCUMENTATION: Add new cache information to resolver doc (IVY-772) (thanks
to Carlton Brown)
Modified: ant/ivy/core/trunk/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/build.xml?rev=649664&r1=649663&r2=649664&view=diff
==============================================================================
--- ant/ivy/core/trunk/build.xml (original)
+++ ant/ivy/core/trunk/build.xml Fri Apr 18 12:31:48 2008
@@ -292,14 +292,7 @@
-->
<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"/>
- </linecontains>
- -->
- <linecontainsregexp>
- <regexp
pattern="[^B][^u][^n][^d][^l][^e][^\-][^V][^e][^r][^s][^i][^o][^n].*"/>
- </linecontainsregexp>
+ <replaceregex pattern="Bundle-Version:.*"
replace="Bundle-Version: ${bundle.version}" byline="true" />
</filterchain>
</copy>
@@ -317,7 +310,6 @@
<attribute name="Implementation-Vendor-Id" value="org.apache"
/>
<attribute name="Extension-name" value="org.apache.ivy" />
<attribute name="Build-Version" value="${build.version}" />
- <attribute name="Bundle-Version" value="${bundle.version}" />
</manifest>
<fileset dir="${core.classes.build.dir}" />
<fileset dir="${ant.classes.build.dir}" />
