FORGE-1421: Replaced javaee-descriptors by ShrinkWrap Descriptors