[KARAF-3544] Spring features should have a conditional on deployer for installing the spring url handler
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f621963e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f621963e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f621963e Branch: refs/heads/master Commit: f621963e39a9019e68391b56df244f9ddf9b0aa4 Parents: 0c350b9 Author: Guillaume Nodet <[email protected]> Authored: Fri Feb 20 11:00:15 2015 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Fri Feb 20 11:00:15 2015 +0100 ---------------------------------------------------------------------- .../spring/src/main/feature/feature.xml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f621963e/assemblies/features/spring/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 838b052..8552f28 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -59,7 +59,10 @@ <bundle start-level="30">mvn:org.springframework/spring-aop/${spring31.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-context/${spring31.version}</bundle> <bundle start-level="30">mvn:org.springframework/spring-context-support/${spring31.version}</bundle> - <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + <conditional> + <condition>deployer</condition> + <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + </conditional> </feature> <feature name="spring-aspects" description="Spring 3.1.x AOP support" version="${spring31.version}"> @@ -137,7 +140,10 @@ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring32.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring32.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring32.version}</bundle> - <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + <conditional> + <condition>deployer</condition> + <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + </conditional> </feature> <feature name="spring-aspects" description="Spring 3.2.x AOP support" version="${spring32.version}"> @@ -215,7 +221,10 @@ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring40.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring40.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring40.version}</bundle> - <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + <conditional> + <condition>deployer</condition> + <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + </conditional> </feature> <feature name="spring-aspects" description="Spring 4.0.x AOP support" version="${spring40.version}"> @@ -289,7 +298,10 @@ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring41.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring41.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring41.version}</bundle> - <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + <conditional> + <condition>deployer</condition> + <bundle start-level="30">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> + </conditional> </feature> <feature name="spring-aspects" description="Spring 4.1.x AOP support" version="${spring41.version}">
