update version to 1.7-SNAPSHOT
update some deps
normalize 2 space xml (yes I gave in)