Fix maven warning about  and