use the upstream war and bump to resolve #2