Modified plugin to use latest version of BND and to use the organization
URL as the default Bundle-DocURL.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@479631 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-bundle-plugin/pom.xml b/tools/maven2/maven-bundle-plugin/pom.xml
index 7a2b487..4ea69bc 100644
--- a/tools/maven2/maven-bundle-plugin/pom.xml
+++ b/tools/maven2/maven-bundle-plugin/pom.xml
@@ -49,7 +49,7 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
- <version>0.0.99</version>
+ <version>0.0.104</version>
</dependency>
<dependency>
<groupId>junit</groupId>
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 8379e40..b7f9ec2 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
@@ -109,6 +109,10 @@
if (project.getOrganization() != null) {
header(properties, Analyzer.BUNDLE_VENDOR, project
.getOrganization().getName());
+ if (project.getOrganization().getUrl() != null) {
+ header(properties, Analyzer.BUNDLE_DOCURL, project
+ .getOrganization().getUrl());
+ }
}
if (new File("src/main/resources").exists()) {
@@ -125,7 +129,6 @@
properties.put("project.build.outputdirectory", outputDirectory );
properties.putAll(instructions);
-
Builder builder = new Builder();
builder.setBase(baseDir);