Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-1328 

Submitted by: Jerome Lacoste
relative filesets incorrectly resolved when when used within reactor

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330202 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-11-02 07:21:34 +00:00
parent 259a63ba90
commit 20ecf7400f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
View File

@ -444,6 +444,11 @@ public class AssemblyMojo
File archiveBaseDir = new File( directory );
if ( ! archiveBaseDir.isAbsolute() )
{
archiveBaseDir = new File( basedir, directory );
}
if ( lineEnding != null )
{
copySetReplacingLineEndings( archiveBaseDir, tmpDir, includes, excludes, lineEnding );

1
maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
View File

@ -102,6 +102,7 @@
<name>directory</name>
<version>1.0.0</version>
<type>String</type>
<description>Absolute or relative from the module's directory.</description>
<required>true</required>
</field>
<field>