Fixing dependency upgrade (bnd and maven-bundle-plugin still TODO)