CAMEL-9865: Fixed features validation and some had a few mistakes.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc7e3fe1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc7e3fe1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc7e3fe1 Branch: refs/heads/master Commit: fc7e3fe1f8594070b145cd8ca34a31b56e56e644 Parents: c463b5e Author: Claus Ibsen <[email protected]> Authored: Thu Apr 14 08:42:06 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Apr 14 09:11:46 2016 +0200 ---------------------------------------------------------------------- components/camel-jsch/pom.xml | 3 +-- components/camel-mvel/pom.xml | 2 -- components/camel-spring-javaconfig/pom.xml | 5 ----- components/camel-test-spring/pom.xml | 6 ------ platforms/karaf/features/pom.xml | 6 ++++-- platforms/karaf/features/src/main/resources/features.xml | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/components/camel-jsch/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 002475b..fadf5fb 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -33,8 +33,7 @@ <properties> <camel.osgi.import.before.defaults> - com.jcraft.jsch.*;version="[0.1.40,0.2)", - org.apache.camel.component.file.strategy;${camel.osgi.import.strict.version} + com.jcraft.jsch.*;version="[0.1.40,0.2)" </camel.osgi.import.before.defaults> <camel.osgi.export.pkg>org.apache.camel.component.scp.*</camel.osgi.export.pkg> <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=scp</camel.osgi.export.service> http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/components/camel-mvel/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index d6dc2b4..21dd7f8 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -30,8 +30,6 @@ <description>Camel MVEL support</description> <properties> - <!-- need to import spi as felix-bundle-plugin has a bug and do not include this package despite we use in the source code --> - <camel.osgi.import.before.defaults>org.apache.camel.spi;${camel.osgi.import.strict.version}</camel.osgi.import.before.defaults> <camel.osgi.export.pkg> org.apache.camel.component.mvel.*, org.apache.camel.language.mvel.* http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/components/camel-spring-javaconfig/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml index 1742d38..bdb500b 100644 --- a/components/camel-spring-javaconfig/pom.xml +++ b/components/camel-spring-javaconfig/pom.xml @@ -30,11 +30,6 @@ <packaging>jar</packaging> <properties> - <!-- camel-spring uses spring-dm that is spring 3.x --> - <camel.osgi.import> - org.springframework*;version="${spring-dm-version-range}", - * - </camel.osgi.import> <camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/components/camel-test-spring/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml index bcf3fe5..2178b57 100644 --- a/components/camel-test-spring/pom.xml +++ b/components/camel-test-spring/pom.xml @@ -31,13 +31,7 @@ <description>Camel Testing Library using JUnit and Spring 4.1+</description> <properties> - <!-- camel-spring uses spring-dm that is spring 3.x --> - <camel.osgi.import> - org.springframework*;version="${spring-dm-version-range}", - * - </camel.osgi.import> <camel.osgi.export.pkg>org.apache.camel.test.spring.*</camel.osgi.export.pkg> - <spring-version>${spring4-version}</spring-version> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/platforms/karaf/features/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml index 1234351..aef768e 100644 --- a/platforms/karaf/features/pom.xml +++ b/platforms/karaf/features/pom.xml @@ -177,12 +177,14 @@ <feature>framework</feature> </framework> <features> + <!-- camel-blueprint uses blueprint but its feature name is different in karaf 3.x vs 4.x --> <!-- camel-cdi requires to install a cdi provider first --> + <!-- camel-cxf uses blueprint but its feature name is different in karaf 3.x vs 4.x --> <!-- camel-ignite requires to install apache ignite first --> <!-- camel-guice does not work in OSGi currently --> - <!-- camel-lucene does not work in OSGi currently (new bundle on the way) --> <!-- camel-leveldb uses some wrap magic to install which validator fails but it works --> - <feature>camel|camel-(?!(cdi|ignite|guice|lucene|leveldb))*</feature> + <!-- camel-zipkin needs an OSGi bundle --> + <feature>camel|camel-(?!(blueprint|cdi|cxf|ignite|guice|leveldb|zipkin))*</feature> </features> <configuration>file://${project.build.directory}/classes/config.properties</configuration> </configuration> http://git-wip-us.apache.org/repos/asf/camel/blob/fc7e3fe1/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 13d92f1..d625f29 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1704,7 +1704,7 @@ </feature> <feature name='camel-test-spring' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-spring</feature> - <feature version='${spring-dm-version-range}'>spring-test</feature> + <feature version='${spring-version-range}'>spring-test</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle> <bundle>mvn:org.apache.camel/camel-test/${project.version}</bundle> <bundle>mvn:org.apache.camel/camel-test-spring/${project.version}</bundle>
