Return-Path: 
 <felix-commits-return-930-apmail-incubator-felix-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org
Received: (qmail 43845 invoked from network); 27 Nov 2006 14:21:16 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 27 Nov 2006 14:21:16 -0000
Received: (qmail 92952 invoked by uid 500); 27 Nov 2006 14:21:26 -0000
Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org
Received: (qmail 92934 invoked by uid 500); 27 Nov 2006 14:21:25 -0000
Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:felix-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:felix-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:felix-commits@incubator.apache.org>
List-Id: <felix-commits.incubator.apache.org>
Reply-To: felix-dev@incubator.apache.org
Delivered-To: mailing list felix-commits@incubator.apache.org
Received: (qmail 92923 invoked by uid 99); 27 Nov 2006 14:21:25 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Nov 2006 06:21:25 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Nov 2006 06:21:15 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id ED3E01A984A; Mon, 27 Nov 2006 06:20:38 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r479631 - in
 /incubator/felix/trunk/tools/maven2/maven-bundle-plugin: pom.xml
 src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
Date: Mon, 27 Nov 2006 14:20:38 -0000
To: felix-commits@incubator.apache.org
From: rickhall@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061127142038.ED3E01A984A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rickhall
Date: Mon Nov 27 06:20:37 2006
New Revision: 479631

URL: http://svn.apache.org/viewvc?view=rev&rev=479631
Log:
Modified plugin to use latest version of BND and to use the organization
URL as the default Bundle-DocURL.

Modified:
    incubator/felix/trunk/tools/maven2/maven-bundle-plugin/pom.xml
    incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java

Modified: incubator/felix/trunk/tools/maven2/maven-bundle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/tools/maven2/maven-bundle-plugin/pom.xml?view=diff&rev=479631&r1=479630&r2=479631
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-bundle-plugin/pom.xml (original)
+++ incubator/felix/trunk/tools/maven2/maven-bundle-plugin/pom.xml Mon Nov 27 06:20:37 2006
@@ -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>

Modified: incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java?view=diff&rev=479631&r1=479630&r2=479631
==============================================================================
--- incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java (original)
+++ incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java Mon Nov 27 06:20:37 2006
@@ -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);