Upgraded for compatibility issue building with maven 3.1.0