PR: MPDIST-32

Apply lf filter before crlf in zip distributions.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@496512 13f79535-47bb-0310-9956-ffa450edef68

dist/plugin.jelly

@@ -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}">

dist/xdocs/changes.xml

@@ -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