Updating to use maven plugin and updating to latest versions Change-Id: I73f1c3dfca68f94a71654c85a46efd9c1e5385cb