diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2015-10-28 00:44:50 +0100 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2015-10-28 00:44:50 +0100 |
| commit | f5dc6edede237288d6b09dddcabd1ed47f55c8c2 (patch) | |
| tree | cb57e83b40c9aea1757db7f7384a932adf295bf8 /lib | |
| parent | 50a69e3e1e8380e51f72441f8ea87fce7f537713 (diff) | |
| download | jitsi-f5dc6edede237288d6b09dddcabd1ed47f55c8c2.zip jitsi-f5dc6edede237288d6b09dddcabd1ed47f55c8c2.tar.gz jitsi-f5dc6edede237288d6b09dddcabd1ed47f55c8c2.tar.bz2 | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/felix.client.run.properties | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index b1cc220..061b70a 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 |