FC-309 - Dependency upgrades - revert conversion to jakarta (not ready yet)