Project upgrade to Java 1.7