diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
new file mode 100644
index 0000000..c14534f
--- /dev/null
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AbstractDependencyFilter.java
@@ -0,0 +1,230 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.bundleplugin;
+
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import aQute.lib.osgi.Instruction;
+
+
+/**
+ * Apply clause-based filter over given dependencies
+ * 
+ * @author mcculls@gmail.com (Stuart McCulloch)
+ */
+public abstract class AbstractDependencyFilter
+{
+    /**
+     * Dependency artifacts.
+     */
+    private final Collection m_dependencyArtifacts;
+
+
+    public AbstractDependencyFilter( Collection dependencyArtifacts )
+    {
+        m_dependencyArtifacts = dependencyArtifacts;
+    }
+
+    private static abstract class DependencyFilter
+    {
+        private final Instruction m_instruction;
+        private final String m_defaultValue;
+
+
+        public DependencyFilter( String expression )
+        {
+            this( expression, "" );
+        }
+
+
+        public DependencyFilter( String expression, String defaultValue )
+        {
+            m_instruction = Instruction.getPattern( expression );
+            m_defaultValue = defaultValue;
+        }
+
+
+        public void filter( Collection dependencies )
+        {
+            for ( Iterator i = dependencies.iterator(); i.hasNext(); )
+            {
+                if ( false == matches( ( Artifact ) i.next() ) )
+                {
+                    i.remove();
+                }
+            }
+        }
+
+
+        abstract boolean matches( Artifact dependency );
+
+
+        boolean matches( String text )
+        {
+            boolean result;
+
+            if ( null == text )
+            {
+                result = m_instruction.matches( m_defaultValue );
+            }
+            else
+            {
+                result = m_instruction.matches( text );
+            }
+
+            return m_instruction.isNegated() ? !result : result;
+        }
+    }
+
+
+    protected final void processInstructions( Map instructions ) throws MojoExecutionException
+    {
+        DependencyFilter filter;
+        for ( Iterator clauseIterator = instructions.entrySet().iterator(); clauseIterator.hasNext(); )
+        {
+            String inline = "false";
+
+            // must use a fresh *modifiable* collection for each unique clause
+            Collection filteredDependencies = new HashSet( m_dependencyArtifacts );
+
+            // CLAUSE: REGEXP --> { ATTRIBUTE MAP }
+            Map.Entry clause = ( Map.Entry ) clauseIterator.next();
+
+            filter = new DependencyFilter( ( String ) clause.getKey() )
+            {
+                boolean matches( Artifact dependency )
+                {
+                    return super.matches( dependency.getArtifactId() );
+                }
+            };
+
+            // FILTER ON MAIN CLAUSE
+            filter.filter( filteredDependencies );
+
+            for ( Iterator attrIterator = ( ( Map ) clause.getValue() ).entrySet().iterator(); attrIterator.hasNext(); )
+            {
+                // ATTRIBUTE: KEY --> REGEXP
+                Map.Entry attr = ( Map.Entry ) attrIterator.next();
+
+                if ( "groupId".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue() )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( dependency.getGroupId() );
+                        }
+                    };
+                }
+                else if ( "artifactId".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue() )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( dependency.getArtifactId() );
+                        }
+                    };
+                }
+                else if ( "version".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue() )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            try
+                            {
+                                // use the symbolic version if available (ie. 1.0.0-SNAPSHOT)
+                                return super.matches( dependency.getSelectedVersion().toString() );
+                            }
+                            catch ( Exception e )
+                            {
+                                return super.matches( dependency.getVersion() );
+                            }
+                        }
+                    };
+                }
+                else if ( "scope".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue(), "compile" )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( dependency.getScope() );
+                        }
+                    };
+                }
+                else if ( "type".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue(), "jar" )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( dependency.getType() );
+                        }
+                    };
+                }
+                else if ( "classifier".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue() )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( dependency.getClassifier() );
+                        }
+                    };
+                }
+                else if ( "optional".equals( attr.getKey() ) )
+                {
+                    filter = new DependencyFilter( ( String ) attr.getValue(), "false" )
+                    {
+                        boolean matches( Artifact dependency )
+                        {
+                            return super.matches( "" + dependency.isOptional() );
+                        }
+                    };
+                }
+                else if ( "inline".equals( attr.getKey() ) )
+                {
+                    inline = ( String ) attr.getValue();
+                    continue;
+                }
+                else
+                {
+                    throw new MojoExecutionException( "Unexpected attribute " + attr.getKey() );
+                }
+
+                // FILTER ON EACH ATTRIBUTE
+                filter.filter( filteredDependencies );
+            }
+
+            processDependencies( inline, filteredDependencies );
+        }
+    }
+
+
+    protected abstract void processDependencies( String inline, Collection filteredDependencies );
+}