FELIX-3349: align external manifest path with current project
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1490846 13f79535-47bb-0310-9956-ffa450edef68
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 46be599..2f1947a 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -720,16 +720,18 @@
// First grab the external manifest file (if specified and different to target location)
File externalManifestFile = archiveConfig.getManifestFile();
- if ( !externalManifestFile.isAbsolute() )
+ if ( null != externalManifestFile )
{
- externalManifestFile = new File( currentProject.getBasedir(), externalManifestFile.getPath() );
- }
- if ( null != externalManifestFile && externalManifestFile.exists()
- && !externalManifestFile.equals( new File( manifestLocation, "MANIFEST.MF" ) ) )
- {
- InputStream mis = new FileInputStream( externalManifestFile );
- mavenManifest.read( mis );
- mis.close();
+ if ( !externalManifestFile.isAbsolute() )
+ {
+ externalManifestFile = new File( currentProject.getBasedir(), externalManifestFile.getPath() );
+ }
+ if ( externalManifestFile.exists() && !externalManifestFile.equals( new File( manifestLocation, "MANIFEST.MF" ) ) )
+ {
+ InputStream mis = new FileInputStream( externalManifestFile );
+ mavenManifest.read( mis );
+ mis.close();
+ }
}
// Then apply customized entries from the jar plugin; note: manifest encoding is UTF8