Now it uses the repackaged version of jsr173 (javax -> org)