Smack OSGi

Enable full OSGi compliance