You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/06/23 21:07:06 UTC
karaf git commit: Fix kar demos when the plugin version is not yet
available
Repository: karaf
Updated Branches:
refs/heads/master 9018aab04 -> aa0db5898
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/aa0db589
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/aa0db589
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/aa0db589
Branch: refs/heads/master
Commit: aa0db589833a993eddedb9d1c35d13f76dfcd3cf
Parents: 9018aab
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Jun 23 21:06:38 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@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/aa0db589/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/aa0db589/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>