[WIP] Maven 3(.0.4) migration