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 11:26:54 UTC

git commit: Fix jasypt-spring31 bundle in jasypt-encryption feature

Repository: karaf
Updated Branches:
  refs/heads/master b4e2c4394 -> ea95ef65d


Fix jasypt-spring31 bundle in jasypt-encryption feature


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ea95ef65
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ea95ef65
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ea95ef65

Branch: refs/heads/master
Commit: ea95ef65dda373a6b27b24f3dc5540778f54ac26
Parents: b4e2c43
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Tue Apr 29 11:26:31 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Apr 29 11:26:31 2014 +0200

----------------------------------------------------------------------
 assemblies/features/standard/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ea95ef65/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 a65165e..a7f6e60 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -266,7 +266,7 @@
         </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>
+            <bundle start-level="30" start="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt-spring31/${jasypt.bundle.version}</bundle>
         </conditional>
     </feature>