karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject [29/35] karaf-boot git commit: Add bnd.bnd by default if present
Date Mon, 09 May 2016 14:48:48 GMT
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 <chris@die-schneider.net>
Authored: Mon Apr 25 14:27:02 2016 +0200
Committer: Christian Schneider <chris@die-schneider.net>
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 {
                     "<supportedProjectType>bundle</supportedProjectType>" +
                     "<supportedProjectType>war</supportedProjectType>" +
                     "</supportedProjectTypes>" +
-                    "<instructions>");
+                    "<instructions>" +
+                    "<_include>-bnd.bnd</_include>"); // include user bnd file
if present
             for (Map.Entry<String, String> entry : instructions.entrySet()) {
                 config.append("<").append(entry.getKey()).append(">")
                         .append(entry.getValue())


Mime
View raw message