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 2017/04/13 09:37:26 UTC
[1/2] karaf git commit: Update the manual to reflect changes to
features packaging made for KARAF-4787
Repository: karaf
Updated Branches:
refs/heads/master ade231ca7 -> 99ec8ddff
Update the manual to reflect changes to features packaging made for KARAF-4787
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f9a20e14
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f9a20e14
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f9a20e14
Branch: refs/heads/master
Commit: f9a20e14b603bf82297d278bf21b50c47c022f9a
Parents: ade231c
Author: Arunan Balasubramaniam <ar...@myitops.com>
Authored: Thu Apr 13 10:02:09 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 13 11:36:51 2017 +0200
----------------------------------------------------------------------
.../developer-guide/karaf-maven-plugin.adoc | 78 +++++++++++---------
1 file changed, 43 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/f9a20e14/manual/src/main/asciidoc/developer-guide/karaf-maven-plugin.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/developer-guide/karaf-maven-plugin.adoc b/manual/src/main/asciidoc/developer-guide/karaf-maven-plugin.adoc
index d832232..6776d6d 100644
--- a/manual/src/main/asciidoc/developer-guide/karaf-maven-plugin.adoc
+++ b/manual/src/main/asciidoc/developer-guide/karaf-maven-plugin.adoc
@@ -55,10 +55,10 @@ Then specify the packaging in your project as usual, e.g.
|Packaging |Description
|feature
-|The feature packaging generates a features.xml descriptor using the `karaf:features-generate-descriptor`
+|The feature packaging verifies a features.xml descriptor using the `karaf:verify` goal.
|kar
-|The kar packaging generates a features.xml descriptor using the `karaf:features-generate-descriptor` and then packages a kar using the `karaf:features-create-kar`
+|The kar packaging generates a features.xml descriptor using the `karaf:features-generate-descriptor` and then packages a kar using the `karaf:features-create-kar` goal.
|karaf-assembly
|Assembles a Karaf server based on the features descriptors and kar files listed as Maven dependencies.
@@ -135,8 +135,6 @@ The `karaf-maven-plugin` provides several goals to help you create and verify fe
===== `karaf:features-generate-descriptor`
-Except in unusual circumstances, use the `<packaging>feature</packaging>` to run this goal.
-
The `karaf:features-generate-descriptor` goal generates a features XML file based on the Maven dependencies.
By default, it will follow Maven transitive dependencies, stopping when it encounters bundles already present in features that are Maven dependencies.
@@ -209,11 +207,19 @@ This can be overridden by specifying the bundle in the source feature.xml with t
<artifactId>karaf-maven-plugin</artifactId>
<version>${project.version}</version>
<extensions>true</extensions>
- <configuration>
- <startLevel>80</startLevel>
- <aggregateFeatures>true</aggregateFeatures>
- </configuration>
- </plugin>
+ <configuration>
+ <enableGeneration>true</enableGeneration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-features-file</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>features-generate-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
@@ -221,6 +227,8 @@ This can be overridden by specifying the bundle in the source feature.xml with t
===== `karaf:verify`
+Except in unusual circumstances, use the `<packaging>feature</packaging>` to run this goal.
+
The `karaf:verify` goal verifies and validates a features XML descriptor by checking if all the required imports
for the bundles defined in the features can be matched to a provided export.
@@ -237,32 +245,32 @@ It reads the definition for the packages that are exported by the system bundle
<project>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <configuration>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>process-resources</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>mvn:org.apache.karaf.features/framework/4.0.4/xml/features</descriptor>
- <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
- </descriptors>
- <distribution>org.apache.karaf.features:framework</distribution>
- <javase>1.8</javase>
- <framework>
- <feature>framework</feature>
- </framework>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf.features/framework/4.0.4/xml/features</descriptor>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>1.8</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
[2/2] karaf git commit: This closes #293
Posted by jb...@apache.org.
This closes #293
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/99ec8ddf
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/99ec8ddf
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/99ec8ddf
Branch: refs/heads/master
Commit: 99ec8ddfff0b20591663a6daadfca65e90b0203a
Parents: ade231c f9a20e1
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Apr 13 11:37:18 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 13 11:37:18 2017 +0200
----------------------------------------------------------------------
.../developer-guide/karaf-maven-plugin.adoc | 78 +++++++++++---------
1 file changed, 43 insertions(+), 35 deletions(-)
----------------------------------------------------------------------