Switched entirely to the proper Maven annotations.