You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/11/02 08:21:44 UTC
svn commit: r330202 - in
/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main:
java/org/apache/maven/plugin/assembly/AssemblyMojo.java mdo/descriptor.mdo
Author: brett
Date: Tue Nov 1 23:21:34 2005
New Revision: 330202
URL: http://svn.apache.org/viewcvs?rev=330202&view=rev
Log:
PR: MNG-1328
Submitted by: Jerome Lacoste
relative filesets incorrectly resolved when when used within reactor
Modified:
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java?rev=330202&r1=330201&r2=330202&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java Tue Nov 1 23:21:34 2005
@@ -444,6 +444,11 @@
File archiveBaseDir = new File( directory );
+ if ( ! archiveBaseDir.isAbsolute() )
+ {
+ archiveBaseDir = new File( basedir, directory );
+ }
+
if ( lineEnding != null )
{
copySetReplacingLineEndings( archiveBaseDir, tmpDir, includes, excludes, lineEnding );
Modified: maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo?rev=330202&r1=330201&r2=330202&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo (original)
+++ maven/components/trunk/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo Tue Nov 1 23:21:34 2005
@@ -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>