UPDATE: Java7 and updated dependencies for maven