CDI-3105 add javax annotations