Updated dependencies and plugins

Also corrected the OSGi configuration