karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [38/50] karaf git commit: Fix kar demos when the plugin version is not yet available
Date Tue, 07 Jul 2015 12:16:07 GMT
Fix kar demos when the plugin version is not yet available


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/69b0069c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/69b0069c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/69b0069c

Branch: refs/heads/master
Commit: 69b0069ceebc6e196b57e54660efed6a45760f5a
Parents: b01dd35
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jun 23 21:06:38 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jun 23 21:06:38 2015 +0200

----------------------------------------------------------------------
 demos/deployer/kar/pom.xml | 19 +++++++++++++++++--
 pom.xml                    |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/69b0069c/demos/deployer/kar/pom.xml
----------------------------------------------------------------------
diff --git a/demos/deployer/kar/pom.xml b/demos/deployer/kar/pom.xml
index 2438bab..053b8d9 100644
--- a/demos/deployer/kar/pom.xml
+++ b/demos/deployer/kar/pom.xml
@@ -31,7 +31,9 @@
     <groupId>org.apache.karaf.demos</groupId>
     <artifactId>my-kar</artifactId>
     <version>4.0.0-SNAPSHOT</version>
-    <packaging>kar</packaging>
+    <packaging>pom</packaging>
+    <!-- You can directly use the kar packaging -->
+    <!-- <packaging>kar</packaging> -->
     <name>Apache Karaf :: Demos :: Deployer :: Kar</name>
 
     <build>
@@ -39,7 +41,20 @@
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <extensions>true</extensions>
+                <!-- using the kar packaging, you just have to use plugin extensions -->
+                <!-- <extensions>true</extensions> -->
+                <!-- if you use the pom packaging, you have to explicitly define the plugin
execution -->
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <goals>
+                            <goal>kar</goal>
+                        </goals>
+                        <configuration>
+                            <featuresFile>${project.basedir}/src/main/feature/feature.xml</featuresFile>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

http://git-wip-us.apache.org/repos/asf/karaf/blob/69b0069c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index feb1f4b..6a35f59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2146,6 +2146,7 @@
                                 <exclude>**/wc.txt</exclude>
                                 <exclude>**/foo</exclude>
                                 <exclude>**/org.ops4j.pax.exam.TestContainerFactory</exclude>
+                                <exclude>**/maven-metadata-local.xml</exclude>
                                 <!--manual resources -->
                                 <exclude>**/*.css</exclude>
                                 <exclude>**/*.ssp</exclude>


Mime
View raw message