Updated dependencies and java version to 1.7