Upgrade to Java 1.7 and aspectj 1.7.4