#580 Fix maven 3 warnings