Update dependencies for Non-OSGi. Not sure if it matters, but it seems cleaner than the way it was