Switching to Java 7 and Maven annotations