Update to new version (but don't deploy until servlet 3.0 is supported