FELIX-3352: pass external filter properties to bnd for processing
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1490836 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 4e8904e..fa35abd 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -65,6 +65,7 @@
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.PropertyUtils;
import org.codehaus.plexus.util.StringUtils;
import aQute.bnd.osgi.Analyzer;
@@ -1210,6 +1211,16 @@
properties.putAll( currentProject.getProperties() );
properties.putAll( currentProject.getModel().getProperties() );
+
+ for ( Iterator i = currentProject.getFilters().iterator(); i.hasNext(); )
+ {
+ File filterFile = new File( ( String ) i.next() );
+ if ( filterFile.isFile() )
+ {
+ properties.putAll( PropertyUtils.loadProperties( filterFile ) );
+ }
+ }
+
if ( m_mavenSession != null )
{
try