Author: ltheussl
Date: Mon Jan 15 13:58:59 2007
New Revision: 496512
URL: http://svn.apache.org/viewvc?view=rev&rev=496512
Log:
PR: MPDIST-32
Apply lf filter before crlf in zip distributions.
Modified:
maven/maven-1/plugins/trunk/dist/plugin.jelly
maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/dist/plugin.jelly
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/plugin.jelly?view=diff&rev=496512&r1=496511&r2=496512
==============================================================================
--- maven/maven-1/plugins/trunk/dist/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/dist/plugin.jelly Mon Jan 15 13:58:59 2007
@@ -231,6 +231,12 @@
</j:if>
<j:if test="${distFormat == 'zip'}">
+ <!-- Use LF line endings for specified files if lf filter
+ is set, apply before crlf so crlf takes precedence -->
+ <j:if test="${lfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.bin.archive.dir}"
+ eol="lf" includes="${lfFilter}"/>
+ </j:if>
<!-- Use CRLF line endings for specified files in zip if crlf filter
is set -->
<j:if test="${crlfFilter.length() > 0}">
@@ -279,6 +285,12 @@
</j:if>
<j:if test="${distFormat == 'zip'}">
+ <!-- Use LF line endings for specified files in unix distros if lf
filter
+ is set, apply before crlf so crlf takes precedence -->
+ <j:if test="${lfFilter.length() > 0}">
+ <ant:fixcrlf srcdir="${maven.dist.src.archive.dir}"
+ eol="lf" includes="${lfFilter}"/>
+ </j:if>
<!-- Use CRLF line endings for text files in zip archive if crlf filter
is set -->
<j:if test="${crlfFilter.length() > 0}">
Modified: maven/maven-1/plugins/trunk/dist/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/dist/xdocs/changes.xml?view=diff&rev=496512&r1=496511&r2=496512
==============================================================================
--- maven/maven-1/plugins/trunk/dist/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/dist/xdocs/changes.xml Mon Jan 15 13:58:59 2007
@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.7.1-SNAPSHOT" date="In SVN">
+ <action dev="ltheussl" type="fix" issue="MPDIST-32">Apply lf filter
before crlf in zip distributions.</action>
<action dev="aheritier" type="update" issue="MAVEN-1755">Upgrade
maven-model to version 3.0.2.</action>
<action dev="ltheussl" type="fix" issue="MPDIST-20" due-to="Phil
Steitz">Fix combined javadoc classpath in
<code>dist:multiproject-bin</code>.</action>
<action dev="ltheussl" type="update" issue="MPDIST-20" due-to="Phil
Steitz">New
