Repository: servicemix Updated Branches: refs/heads/master ca3a0bcac -> 4eb7dafb9
SM-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/e73cd86d Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e73cd86d Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e73cd86d Branch: refs/heads/master Commit: e73cd86d7ef1e568531dcba9d533c3e8c944a0cc Parents: ca3a0bc Author: Krzysztof Sobkowiak <[email protected]> Authored: Mon Jun 8 21:39:44 2015 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Mon Jun 8 21:39:44 2015 +0200 ---------------------------------------------------------------------- assembly/src/main/filtered-resources/startup-obr.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/e73cd86d/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 4b52a5d..06704b7 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-2469 @@ -26,4 +26,4 @@ org/apache/karaf/features/org.apache.karaf.features.obr/${karaf.version}/org.apa # and activiti tries to resolve this bundle via multiple paths. Starting this bundle as soon as possible # should force another bundles to wire this bundle (when compatible with the dependency requirements) instead # of installing another versions -joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10 \ No newline at end of file +joda-time/joda-time/${jodatime2.bundle.version}/joda-time-${jodatime2.bundle.version}.jar=10
