Upgrade to Java 7 and Spring 3.1