mirror of https://github.com/apache/ant-ivy
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 git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@649664 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
439e0aa3d1
commit
c8d9bd438d
|
|
@ -112,6 +112,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
|
|||
- 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)
|
||||
|
|
|
|||
10
build.xml
10
build.xml
|
|
@ -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}" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue