Upgrading/managing several plugins to better support maven-3.1.1