Moved to Java7 and Maven3