Go with 2.1-SNAPSHOT from upstream, deploy to snapshot location.