Upgrade to JAX-RS 2