remove annotation com.sun.istack.internal.* and add javax.annotation