commit 6f241f065e2e31b1d6f2464e34daa08360ebe692
author Stuart McCulloch <mcculls@apache.org> Fri Jun 07 21:42:04 2013 +0000
committer Stuart McCulloch <mcculls@apache.org> Fri Jun 07 21:42:04 2013 +0000
tree 8034ade050d429f936398ad88a5cf9ab6b26a49b
parent 437f48735c029004aa8cfcc3b4e16d6f32122ddd

FELIX-3349: align external manifest path with current project

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1490844 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index fa35abd..46be599 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -720,6 +720,10 @@
 
             // First grab the external manifest file (if specified and different to target location)
             File externalManifestFile = archiveConfig.getManifestFile();
+            if ( !externalManifestFile.isAbsolute() )
+            {
+                externalManifestFile = new File( currentProject.getBasedir(), externalManifestFile.getPath() );
+            }
             if ( null != externalManifestFile && externalManifestFile.exists()
                 && !externalManifestFile.equals( new File( manifestLocation, "MANIFEST.MF" ) ) )
             {