Upgraded to Java 7 based build