Update pom to support maven 3.1.  Upgrade other deps.