CAL-992 Fix [WARNING] issues during maven build