remove dead dependencies, move spring stuff to "contrib" and replace
some bundles with versions from eclipse orbit