Update to Jersey 2