Repository: karaf Updated Branches: refs/heads/master 7700b1cf4 -> d8ca633d9
[KARAF-4159] Spring install in multiple versions when installing spring-dm Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d8ca633d Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d8ca633d Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d8ca633d Branch: refs/heads/master Commit: d8ca633d9035c24c6ea3594aaac3a016a9e08e15 Parents: 7700b1c Author: Guillaume Nodet <[email protected]> Authored: Fri Dec 4 17:21:33 2015 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Mon Dec 7 08:46:33 2015 +0100 ---------------------------------------------------------------------- .../spring/src/main/feature/feature.xml | 20 -------------------- .../standard/src/main/feature/feature.xml | 4 ---- 2 files changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/d8ca633d/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 605df00..5980630 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -59,10 +59,6 @@ <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> - <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}"> @@ -140,10 +136,6 @@ <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> - <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}"> @@ -221,10 +213,6 @@ <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> - <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}"> @@ -298,10 +286,6 @@ <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> - <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}"> @@ -375,10 +359,6 @@ <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-aop/${spring42.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context/${spring42.version}</bundle> <bundle start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.spring-context-support/${spring42.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.2.x AOP support" version="${spring42.version}"> http://git-wip-us.apache.org/repos/asf/karaf/blob/d8ca633d/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index ec1a4ef..5413c3f 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -125,10 +125,6 @@ <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle> </conditional> <conditional> - <condition>spring</condition> - <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle> - </conditional> - <conditional> <condition>kar</condition> <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle> </conditional>
