Return-Path: Delivered-To: apmail-incubator-felix-commits-archive@www.apache.org Received: (qmail 11939 invoked from network); 31 Oct 2006 18:53:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 Oct 2006 18:53:24 -0000 Received: (qmail 43132 invoked by uid 500); 31 Oct 2006 18:53:36 -0000 Delivered-To: apmail-incubator-felix-commits-archive@incubator.apache.org Received: (qmail 43117 invoked by uid 500); 31 Oct 2006 18:53:36 -0000 Mailing-List: contact felix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: felix-dev@incubator.apache.org Delivered-To: mailing list felix-commits@incubator.apache.org Received: (qmail 43106 invoked by uid 99); 31 Oct 2006 18:53:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Oct 2006 10:53:35 -0800 X-ASF-Spam-Status: No, hits=1.7 required=10.0 tests=BIZ_TLD,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; Tue, 31 Oct 2006 10:53:22 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8051F1A9846; Tue, 31 Oct 2006 10:52:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r469608 - in /incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main: java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java resources/NOTICE Date: Tue, 31 Oct 2006 18:52:57 -0000 To: felix-commits@incubator.apache.org From: rickhall@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061031185258.8051F1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickhall Date: Tue Oct 31 10:52:57 2006 New Revision: 469608 URL: http://svn.apache.org/viewvc?view=rev&rev=469608 Log: Commented out the default for Include-Resource and updated the NOTICE file. Modified: incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE 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=469608&r1=469607&r2=469608 ============================================================================== --- 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 Tue Oct 31 10:52:57 2006 @@ -99,7 +99,7 @@ header(properties, Analyzer.BUNDLE_NAME, project.getName()); header(properties, Analyzer.BUNDLE_VENDOR, project .getOrganization()); - header(properties, Analyzer.INCLUDE_RESOURCE, "src/main/resources"); +// header(properties, Analyzer.INCLUDE_RESOURCE, "src/main/resources"); properties.putAll(project.getProperties()); properties.putAll(project.getModel().getProperties()); Modified: incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE URL: http://svn.apache.org/viewvc/incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE?view=diff&rev=469608&r1=469607&r2=469608 ============================================================================== --- incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE (original) +++ incubator/felix/trunk/tools/maven2/maven-bundle-plugin/src/main/resources/NOTICE Tue Oct 31 10:52:57 2006 @@ -16,4 +16,4 @@ This product includes software developed by Peter Kriens (http://www.aqute.biz/Code/Bnd) -Copyright 2006 Peter Kriens +Copyright 2006 aQute, All rights reserved