Repository: camel Updated Branches: refs/heads/master 86cc98ae0 -> 9ab4508e2
Fix karaf 4 validation profile Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9ab4508e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9ab4508e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9ab4508e Branch: refs/heads/master Commit: 9ab4508e2b2426bb75a74a30298adb8c0f276b1f Parents: 86cc98a Author: Guillaume Nodet <gno...@apache.org> Authored: Tue Mar 15 09:21:16 2016 +0100 Committer: Guillaume Nodet <gno...@apache.org> Committed: Tue Mar 15 09:21:16 2016 +0100 ---------------------------------------------------------------------- platforms/karaf/features/pom.xml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9ab4508e/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index d9def0c..8c72bf2 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -81,6 +81,13 @@ <version>${karaf-version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.karaf.features</groupId> + <artifactId>framework</artifactId> + <version>${karaf4-version}</version> + <type>kar</type> + <scope>provided</scope> + </dependency> </dependencies> <build> @@ -190,8 +197,21 @@ <artifactId>karaf-maven-plugin</artifactId> <version>${karaf4-version}</version> <configuration> - <file>${project.build.directory}/classes/${features.file}</file> - <jreVersion>jre-1.8</jreVersion> + <descriptors> + <descriptor>file://${project.build.directory}/classes/${features.file}</descriptor> + <!-- ideally, those profiles should be referenced in the features file --> + <descriptor>mvn:org.apache.karaf.features/framework/${karaf4-version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf4-version}/xml/features</descriptor> + <descriptor>mvn:org.apache.karaf.features/spring/${karaf4-version}/xml/features</descriptor> + </descriptors> + <distribution>org.apache.karaf.features:framework</distribution> + <javase>1.8</javase> + <framework> + <feature>framework</feature> + </framework> + <features> + <feature>camel-*</feature> + </features> </configuration> <executions> <execution>
