Replaced some dependencies with OSGI-friendly versions