Fixing dependency conflicts; adding support for one-jar plugin