Updated Maven dependencies
Java 7 style