Update to use Java 5 anotations for Maven 3.0