Repository: karaf Updated Branches: refs/heads/master 0c0835a5c -> ca4d35e7c
[KARAF-2944] Add jasypt-spring31 bundle in the jasypt-encrytion feature conditional to the spring feature Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ca4d35e7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ca4d35e7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ca4d35e7 Branch: refs/heads/master Commit: ca4d35e7cb18b2b622731fb3ecedd7255fbd131b Parents: 0c0835a Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Apr 29 02:28:36 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Apr 29 02:37:21 2014 +0200 ---------------------------------------------------------------------- assemblies/features/standard/src/main/feature/feature.xml | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/ca4d35e7/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 1ff2fb0..a65165e 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -264,6 +264,10 @@ <condition>aries-blueprint</condition> <bundle start-level="30" start="true">mvn:org.apache.karaf.jaas.blueprint/org.apache.karaf.jaas.blueprint.jasypt/${project.version}</bundle> </conditional> + <conditional> + <condition>spring</condition> + <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle> + </conditional> </feature> <feature name="scr" description="Declarative Service support" version="${project.version}">
