Update to maven3, version bump