Fix scr feature to add missing capabilities
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0cf070d4 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0cf070d4 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0cf070d4 Branch: refs/heads/master Commit: 0cf070d4f56348110b74234ce7a2a82022572f4d Parents: b46bd22 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon May 19 09:59:53 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon May 19 21:16:05 2014 +0200 ---------------------------------------------------------------------- assemblies/features/standard/src/main/feature/feature.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0cf070d4/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 a7f6e60..c02dea0 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -273,7 +273,7 @@ <feature name="scr" description="Declarative Service support" version="${project.version}"> <feature>eventadmin</feature> <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle> - <bundle dependency="true" start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle> + <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.scr/${felix.scr.version}</bundle> <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle> <conditional> <condition>management</condition> @@ -283,6 +283,10 @@ <condition>webconsole</condition> <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle> </conditional> + <capability> + osgi.service;effective:=active;objectClass=org.apache.felix.scr.ScrService, + osgi.extender;osgi.extender="osgi.component";uses:="org.osgi.service.component";version:Version="1.2.1" + </capability> </feature> <feature name="blueprint-web" description="Provides an OSGI-aware Servlet ContextListener for bootstrapping