From f5dc6edede237288d6b09dddcabd1ed47f55c8c2 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Wed, 28 Oct 2015 00:44:50 +0100 Subject: [PATCH] Remove bundle start level conflict Fixes #162 Fixes #163 Fixes #172 The build process injects an additional bundle at start level 14. This conflicted with the start level for commons-codec, preventing Jitsi to start. Felix' bundle cache might have prevented the bug from appearing for people who had a previous version running successfully. --- lib/felix.client.run.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index b1cc22075..061b70ac1 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -48,8 +48,12 @@ felix.auto.start.10= \ # file:lib/bundle/servicebinder.jar \ # file:lib/bundle/tablelayout.jar -felix.auto.start.14= \ +felix.auto.start.13= \ reference:file:sc-bundles/commons-codec.jar + +#warning: felix.auto.start.14 is injected by the windows build +# for the clean-shutdown-bundle + felix.auto.start.15= \ reference:file:sc-bundles/zrtp4j.jar \ reference:file:sc-bundles/sdes4j.jar