Merge "javax to jakarta and refactoring"