Move to maven 3

Move to maven 3