CAMEL-9865: Upgrade to karaf 4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c463b5ef Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c463b5ef Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c463b5ef Branch: refs/heads/master Commit: c463b5efb7ab182453a9d5486e55cffea5e02168 Parents: 2ff90ed Author: Claus Ibsen <[email protected]> Authored: Thu Apr 14 08:18:36 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Apr 14 09:11:46 2016 +0200 ---------------------------------------------------------------------- platforms/karaf/features/pom.xml | 37 ++--------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/c463b5ef/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 82f5d95..1234351 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -78,7 +78,7 @@ <dependency> <groupId>org.apache.karaf.shell</groupId> <artifactId>org.apache.karaf.shell.console</artifactId> - <version>${karaf-version}</version> + <version>${karaf4-version}</version> <scope>provided</scope> </dependency> <dependency> @@ -154,46 +154,13 @@ </repositories> </profile> + <!-- validating using karaf 4.x --> <profile> <id>validate</id> <build> <plugins> <plugin> <groupId>org.apache.karaf.tooling</groupId> - <artifactId>features-maven-plugin</artifactId> - <version>${karaf-version}</version> - <configuration> - <file>${project.build.directory}/classes/${features.file}</file> - <karafConfig>${project.build.directory}/classes/config.properties</karafConfig> - <jreVersion>jre-1.6</jreVersion> - </configuration> - <executions> - <execution> - <id>validate</id> - <phase>process-resources</phase> - <goals> - <goal>validate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>2.8</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>validate-karaf4</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${karaf4-version}</version> <configuration>
