You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/04/29 02:29:18 UTC
git commit: [KARAF-2944] Add jasypt-spring31 bundle in the
jasypt-encrytion feature conditional to the spring feature
Repository: karaf
Updated Branches:
refs/heads/karaf-3.0.x 76e42d079 -> 417efdf7e
[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/417efdf7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/417efdf7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/417efdf7
Branch: refs/heads/karaf-3.0.x
Commit: 417efdf7e8c947f35aec5817717adbc597704983
Parents: 76e42d0
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Apr 29 02:28:36 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Apr 29 02:28:36 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/417efdf7/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 a785feb..0d85e2d 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -184,6 +184,10 @@
<bundle dependency="true" start-level="30">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>
<bundle start-level="30">mvn:org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/${project.version}</bundle>
+ <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}" resolver="(obr)">