Fix trigger of default Export-Package setting to also consider included property files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@616703 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 95d057c..da3f628 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -328,13 +328,6 @@
Jar[] classpath ) throws Exception
{
properties.putAll( getDefaultProperties( currentProject ) );
-
- String bsn = currentProject.getGroupId() + "." + currentProject.getArtifactId();
- if ( !originalInstructions.containsKey( Analyzer.PRIVATE_PACKAGE ) )
- {
- properties.put( Analyzer.EXPORT_PACKAGE, bsn + ".*" );
- }
-
properties.putAll( transformDirectives( originalInstructions ) );
// update BND instructions to add Maven resources
@@ -345,6 +338,12 @@
builder.setProperties( properties );
builder.setClasspath( classpath );
+ if ( !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
+ {
+ String bsn = currentProject.getGroupId() + "." + currentProject.getArtifactId();
+ properties.put( Analyzer.EXPORT_PACKAGE, bsn + ".*" );
+ }
+
// update BND instructions to embed selected Maven dependencies
Collection embeddableArtifacts = getEmbeddableArtifacts( currentProject, properties );
new DependencyEmbedder( embeddableArtifacts ).processHeaders( properties );