Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 73AFA2004C8 for ; Mon, 9 May 2016 16:48:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 72E4B16099C; Mon, 9 May 2016 14:48:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ED65E160A2B for ; Mon, 9 May 2016 16:48:22 +0200 (CEST) Received: (qmail 80473 invoked by uid 500); 9 May 2016 14:48:22 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 80324 invoked by uid 99); 9 May 2016 14:48:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2016 14:48:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F1940E0329; Mon, 9 May 2016 14:48:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cschneider@apache.org To: commits@karaf.apache.org Date: Mon, 09 May 2016 14:48:48 -0000 Message-Id: In-Reply-To: <1e3eeb57e42d4f938950e5b22b1cb7f9@git.apache.org> References: <1e3eeb57e42d4f938950e5b22b1cb7f9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/35] karaf-boot git commit: Add bnd.bnd by default if present archived-at: Mon, 09 May 2016 14:48:24 -0000 Add bnd.bnd by default if present Project: http://git-wip-us.apache.org/repos/asf/karaf-boot/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-boot/commit/5e0846ff Tree: http://git-wip-us.apache.org/repos/asf/karaf-boot/tree/5e0846ff Diff: http://git-wip-us.apache.org/repos/asf/karaf-boot/diff/5e0846ff Branch: refs/heads/master Commit: 5e0846ffced2d78a73f2c5339799a682fac368b6 Parents: c615578 Author: Christian Schneider Authored: Mon Apr 25 14:27:02 2016 +0200 Committer: Christian Schneider Committed: Mon Apr 25 14:27:02 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/boot/maven/GenerateMojo.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-boot/blob/5e0846ff/tools/karaf-boot-maven-plugin/src/main/java/org/apache/karaf/boot/maven/GenerateMojo.java ---------------------------------------------------------------------- diff --git a/tools/karaf-boot-maven-plugin/src/main/java/org/apache/karaf/boot/maven/GenerateMojo.java b/tools/karaf-boot-maven-plugin/src/main/java/org/apache/karaf/boot/maven/GenerateMojo.java index dd88688..ee97d14 100644 --- a/tools/karaf-boot-maven-plugin/src/main/java/org/apache/karaf/boot/maven/GenerateMojo.java +++ b/tools/karaf-boot-maven-plugin/src/main/java/org/apache/karaf/boot/maven/GenerateMojo.java @@ -13,7 +13,6 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.xml.Xpp3Dom; import org.codehaus.plexus.util.xml.Xpp3DomBuilder; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; @@ -47,11 +46,6 @@ public class GenerateMojo extends AbstractMojo { complete(instructions, bndInst); bndInst.delete(); } - // User supplied instructions - bndInst = new File(mavenProject.getBasedir(), "osgi.bnd"); - if (bndInst.isFile()) { - complete(instructions, bndInst); - } // Verify and use defaults if (instructions.containsKey("Import-Package")) { instructions.put("Import-Package", instructions.get("Import-Package") + ",*"); @@ -69,7 +63,8 @@ public class GenerateMojo extends AbstractMojo { "bundle" + "war" + "" + - ""); + "" + + "<_include>-bnd.bnd"); // include user bnd file if present for (Map.Entry entry : instructions.entrySet()) { config.append("<").append(entry.getKey()).append(">") .append(entry.getValue())