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/06/08 23:57:20 UTC
servicemix git commit: M-2291: Remove the workaround for the obr and
jndi problem
Repository: servicemix
Updated Branches:
refs/heads/servicemix-5.4.x 0e2aefe8e -> b13c7580c
M-2291: Remove the workaround for the obr and jndi problem
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/b13c7580
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/b13c7580
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/b13c7580
Branch: refs/heads/servicemix-5.4.x
Commit: b13c7580c278dc043b7c0bab912be13016eeba12
Parents: 0e2aefe
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Jun 8 23:53:50 2015 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Jun 8 23:53:50 2015 +0200
----------------------------------------------------------------------
assembly/src/main/filtered-resources/startup-obr.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/b13c7580/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 e9867db..0cfcde5 100644
--- a/assembly/src/main/filtered-resources/startup-obr.properties
+++ b/assembly/src/main/filtered-resources/startup-obr.properties
@@ -16,7 +16,7 @@
#
# enabling features OBR resolver support
-org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=30
+org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=10
org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apache.karaf.features.obr-${karaf.version}.jar=30
# Workaround for SM-2414: Camel route does not run when it's placed into deploy folder