commit | b0a351d111df33d95de7776e828a1553ad98984f | [log] [tgz] |
---|---|---|
author | Richard S. Hall <rickhall@apache.org> | Fri Nov 03 15:07:17 2006 +0000 |
committer | Richard S. Hall <rickhall@apache.org> | Fri Nov 03 15:07:17 2006 +0000 |
tree | f5640c15e6790ee65f3bbf681111084853ce1f28 | |
parent | f79928c6c26691435760ebdac164004b0716e5de [diff] |
Modified the plugin so that default value for Export-Package is empty if Private-Package is specified. git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@470846 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java b/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java index 27879ec..4c25c33 100644 --- a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java +++ b/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
@@ -90,7 +90,9 @@ Properties properties = new Properties(); properties.put(Analyzer.BUNDLE_SYMBOLICNAME, bsn); properties.put(Analyzer.IMPORT_PACKAGE, "*"); - properties.put(Analyzer.EXPORT_PACKAGE, bsn + ".*"); + if (!instructions.containsKey(Analyzer.PRIVATE_PACKAGE)) { + properties.put(Analyzer.EXPORT_PACKAGE, bsn + ".*"); + } String version = project.getVersion(); Pattern P_VERSION = Pattern.compile("([0-9]+(\\.[0-9])*)-(.*)"); Matcher m = P_VERSION.matcher(version);