Maven 2 & 3

revert separation of plugin and dependency repositories