Ben: cut over to maven plugin annotations