Re-working the versioning to better work with maven