From 20ecf7400f97eb454f9fba0eeb8580a5f9686909 Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Wed, 2 Nov 2005 07:21:34 +0000
Subject: [PATCH] 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
---
 .../java/org/apache/maven/plugin/assembly/AssemblyMojo.java  | 5 +++++
 .../maven-assembly-plugin/src/main/mdo/descriptor.mdo        | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java b/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
index 2fb7309620..343b8d8e2c 100755
--- a/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
+++ b/maven-plugins/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/AssemblyMojo.java
@@ -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 );
diff --git a/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo b/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
index 63b6e8cef7..9b1704e8f7 100644
--- a/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
+++ b/maven-plugins/maven-assembly-plugin/src/main/mdo/descriptor.mdo
@@ -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>