upgrade parent
upgrade generics to Java 7
upgrade to Java 7 syntax