Minor maven plugin upgrades and fixes