Upgrade to Jersey2