You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2015/01/15 23:54:16 UTC

servicemix git commit: SM-2415: Add missing Spring Deployer bundle into startup.properties

Repository: servicemix
Updated Branches:
  refs/heads/servicemix-5.3.x 52500a597 -> d8eb4b474


SM-2415: Add missing Spring Deployer bundle into startup.properties


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

Branch: refs/heads/servicemix-5.3.x
Commit: d8eb4b47492de486f005601702cd95893dd5341d
Parents: 52500a5
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 15 23:10:09 2015 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 15 23:10:09 2015 +0100

----------------------------------------------------------------------
 assembly/src/main/filtered-resources/startup-obr.properties | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/d8eb4b47/assembly/src/main/filtered-resources/startup-obr.properties
----------------------------------------------------------------------
diff --git a/assembly/src/main/filtered-resources/startup-obr.properties b/assembly/src/main/filtered-resources/startup-obr.properties
index 23ec087..7e1a495 100644
--- a/assembly/src/main/filtered-resources/startup-obr.properties
+++ b/assembly/src/main/filtered-resources/startup-obr.properties
@@ -21,3 +21,6 @@ org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apa
 
 # Fix for SM-2301: ensure joda-time bundle is installed before any features get resolved
 org/apache/servicemix/bundles/org.apache.servicemix.bundles.joda-time/2.3_1/org.apache.servicemix.bundles.joda-time-2.3_1.jar=25
+
+# Workaround for SM-2414: Camel route does not run when it's placed into deploy folder
+org/apache/karaf/deployer/org.apache.karaf.deployer.spring/${karaf.version}/org.apache.karaf.deployer.spring-${karaf.version}.jar=28